po/todo: take note of the commit that will need to be reverted later

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

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index a34515f2148a2e8619ac70c3e1844086c20bfab3..6ee11209624a20a1a0080852b6f4a64dda756543 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 ($) { # {{{
+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, $!));
@@ -25,13 +27,13 @@ sub load ($) { # {{{
 
        eval $code;
        error("$setup: ".$@) if $@;
-} #}}}
+}
 
 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}) {
@@ -69,9 +71,9 @@ sub merge ($) {
                        wrappermode => (defined $config{cgi_wrappermode} ? $config{cgi_wrappermode} : "06755"),
                };
        }
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
        # Gets all available setup data from all plugins. Returns an
        # ordered list of [plugin, setup] pairs.
        my @ret;
@@ -103,9 +105,9 @@ sub getsetup () { #{{{
         $config{syslog}=$syslog;
 
        return @ret;
-} #}}}
+}
 
-sub dump ($) { #{{{
+sub dump ($) {
        my $file=IkiWiki::possibly_foolish_untaint(shift);
        
        require IkiWiki::Setup::Standard;