Merge commit 'origin/master'

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

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index d2d1e4b8e7fd44b88c0ed64f110e609f78785ea5..77afdd6084e94084ba8e6a09b8bba632f3adcbfc 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -8,10 +8,12 @@ use warnings;
 use strict;
 use IkiWiki;
 use open qw{:utf8 :std};
+use File::Spec;
 
 sub load ($) { # {{{
        my $setup=IkiWiki::possibly_foolish_untaint(shift);
-       delete $config{setup};
+       $config{setupfile}=File::Spec->rel2abs($setup);
+
        #translators: The first parameter is a filename, and the second
        #translators: is a (probably not translated) error message.
        open (IN, $setup) || error(sprintf(gettext("cannot read %s: %s"), $setup, $!));
@@ -31,7 +33,7 @@ sub merge ($) {
        # Merge setup into existing config and untaint.
        my %setup=%{shift()};
 
-       if (exists $setup{add_plugins}) {
+       if (exists $setup{add_plugins} && exists $config{add_plugins}) {
                push @{$setup{add_plugins}}, @{$config{add_plugins}};
        }
        if (exists $setup{exclude}) {
@@ -79,7 +81,7 @@ sub getsetup () { #{{{
         # disable logging to syslog while dumping, broken plugins may
        # whine when loaded
        my $syslog=$config{syslog};
-        $config{syslog}=0;
+        $config{syslog}=undef;
 
        # Load all plugins, so that all setup options are available.
        my @plugins=grep { $_ ne $config{rcs} } sort(IkiWiki::listplugins());