* Fix dates in rss feeds if running localised, so they're still rfc 822.

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d42ceffa08d0767743d5036ab9b6948a2ffd19da..b76c87b8e9ccf4b17c83c8e32dd88821e98016d6 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -30,8 +30,11 @@ sub setup_standard {
                }
                delete $setup{disable_plugins};
        }
                }
                delete $setup{disable_plugins};
        }

+       if (exists $setup{exclude}) {
+               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+       }

 
 

-       if (! $config{refresh}) {
+       if (! $config{refresh} || $config{wrappers}) {

                debug("generating wrappers..");
                my @wrappers=@{$setup{wrappers}};
                delete $setup{wrappers};
                debug("generating wrappers..");
                my @wrappers=@{$setup{wrappers}};
                delete $setup{wrappers};


@@ -43,9 +46,6 @@ sub setup_standard {
                }
                %config=(%startconfig);
        }
                }
                %config=(%startconfig);
        }

-       else {
-               delete $setup{wrappers};
-       }

        
        foreach my $c (keys %setup) {
                if (defined $setup{$c}) {
        
        foreach my $c (keys %setup) {
                if (defined $setup{$c}) {


@@ -69,6 +69,7 @@ sub setup_standard {
                debug("refreshing wiki..");
        }
 
                debug("refreshing wiki..");
        }
 

+       loadplugins();

        checkconfig();
        lockwiki();
        loadindex();
        checkconfig();
        lockwiki();
        loadindex();