po: new po_translation_status_in_links option

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

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index f8bb664c4b46bc716aa6a02fe745ce3483afe794..6ee11209624a20a1a0080852b6f4a64dda756543 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -10,7 +10,7 @@ use IkiWiki;
 use open qw{:utf8 :std};
 use File::Spec;
 
 use open qw{:utf8 :std};
 use File::Spec;
 

-sub load ($) { # {{{
+sub load ($) {

        my $setup=IkiWiki::possibly_foolish_untaint(shift);
        $config{setupfile}=File::Spec->rel2abs($setup);
 
        my $setup=IkiWiki::possibly_foolish_untaint(shift);
        $config{setupfile}=File::Spec->rel2abs($setup);
 


@@ -27,13 +27,13 @@ sub load ($) { # {{{
 
        eval $code;
        error("$setup: ".$@) if $@;
 
        eval $code;
        error("$setup: ".$@) if $@;

-} #}}}
+}

 
 sub merge ($) {
        # Merge setup into existing config and untaint.
        my %setup=%{shift()};
 
 
 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}) {
                push @{$setup{add_plugins}}, @{$config{add_plugins}};
        }
        if (exists $setup{exclude}) {


@@ -71,9 +71,9 @@ sub merge ($) {
                        wrappermode => (defined $config{cgi_wrappermode} ? $config{cgi_wrappermode} : "06755"),
                };
        }
                        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;
        # Gets all available setup data from all plugins. Returns an
        # ordered list of [plugin, setup] pairs.
        my @ret;


@@ -105,9 +105,9 @@ sub getsetup () { #{{{
         $config{syslog}=$syslog;
 
        return @ret;
         $config{syslog}=$syslog;
 
        return @ret;

-} #}}}
+}

 
 

-sub dump ($) { #{{{
+sub dump ($) {

        my $file=IkiWiki::possibly_foolish_untaint(shift);
        
        require IkiWiki::Setup::Standard;
        my $file=IkiWiki::possibly_foolish_untaint(shift);
        
        require IkiWiki::Setup::Standard;