* Turn $config{wiki_file_prune_regexps} into an array that is easier to

[ikiwiki.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index d086537114544581cab44682df4c97bc220fd112..4033468b23a7917aadc01c0fd9fc9fed416c4573 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -218,7 +218,7 @@ sub refresh () { #{{{
                no_chdir => 1,
                wanted => sub {
                        $_=decode_utf8($_);
                no_chdir => 1,
                wanted => sub {
                        $_=decode_utf8($_);

-                       if (/$config{wiki_file_prune_regexp}/) {
+                       if (file_pruned($_, $config{srcdir})) {

                                $File::Find::prune=1;
                        }
                        elsif (! -d $_ && ! -l $_) {
                                $File::Find::prune=1;
                        }
                        elsif (! -d $_ && ! -l $_) {


@@ -238,7 +238,7 @@ sub refresh () { #{{{
                no_chdir => 1,
                wanted => sub {
                        $_=decode_utf8($_);
                no_chdir => 1,
                wanted => sub {
                        $_=decode_utf8($_);

-                       if (/$config{wiki_file_prune_regexp}/) {
+                       if (file_pruned($_, $config{underlaydir})) {

                                $File::Find::prune=1;
                        }
                        elsif (! -d $_ && ! -l $_) {
                                $File::Find::prune=1;
                        }
                        elsif (! -d $_ && ! -l $_) {