* Patch from Emanuele Aina to fix modification time code in mercurual

[ikiwiki.git] / IkiWiki / Setup / Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index b7583097daf84851b0ebc43900ae941e79677695..77c164e34a61f6cac39e7acb16f331aedfd21878 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -31,10 +31,10 @@ sub setup_standard {
                delete $setup{disable_plugins};
        }
        if (exists $setup{exclude}) {
-               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+               push @{$config{wiki_file_prune_regexps}}, $setup{exclude};
        }
 
-       if (! $config{refresh} || $config{wrappers}) {
+       if (! $config{render} && (! $config{refresh} || $config{wrappers})) {
                debug("generating wrappers..");
                my @wrappers=@{$setup{wrappers}};
                delete $setup{wrappers};
@@ -66,7 +66,10 @@ sub setup_standard {
                }
        }
 
-       if (! $config{refresh}) {
+       if ($config{render}) {
+               commandline_render();
+       }
+       elsif (! $config{refresh}) {
                $config{rebuild}=1;
                debug("rebuilding wiki..");
        }