Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 73e32447c05c651eead1617ddcaaa39d650ceb96..d2d1e4b8e7fd44b88c0ed64f110e609f78785ea5 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -72,14 +72,17 @@ sub merge ($) {
 } #}}}
 
 sub getsetup () { #{{{
-       # Gets all available setup data from all plugins. Returns an ordered list of
-       # [plugin, setup] pairs.
+       # Gets all available setup data from all plugins. Returns an
+       # ordered list of [plugin, setup] pairs.
        my @ret;
 
+        # disable logging to syslog while dumping, broken plugins may
+       # whine when loaded
+       my $syslog=$config{syslog};
+        $config{syslog}=0;
+
        # Load all plugins, so that all setup options are available.
-       # (But skip a few problematic external demo plugins.)
-       my @plugins=grep { ! /^(externaldemo|pythondemo|\Q$config{rcs}\E)$/ }
-               sort(IkiWiki::listplugins());
+       my @plugins=grep { $_ ne $config{rcs} } sort(IkiWiki::listplugins());
        unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st
        foreach my $plugin (@plugins) {
                eval { IkiWiki::loadplugin($plugin) };
@@ -96,6 +99,8 @@ sub getsetup () { #{{{
                        push @ret, [ $plugin, \@s ],
                }
        }
+       
+        $config{syslog}=$syslog;
 
        return @ret;
 } #}}}