don't fail if %config is not set

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index f8bb664c4b46bc716aa6a02fe745ce3483afe794..77afdd6084e94084ba8e6a09b8bba632f3adcbfc 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -33,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}) {

diff --git a/doc/bugs/IkiWiki::Setup::load__40____41___broken_outside_ikiwiki__63__.mdwn b/doc/bugs/IkiWiki::Setup::load__40____41___broken_outside_ikiwiki__63__.mdwn
index b92a96838b56ce4228eadeff8e0bf708532a5a34..e1e29f0a47898858e0b5f14102b45709d1dd3a65 100644 (file)
--- a/doc/bugs/IkiWiki::Setup::load__40____41___broken_outside_ikiwiki__63__.mdwn
+++ b/doc/bugs/IkiWiki::Setup::load__40____41___broken_outside_ikiwiki__63__.mdwn
@@ -16,3 +16,5 @@ This is in ikiwiki 2.62.1. I think this call used to work in 2.54 (when you firs
 >> It seems that `%config = IkiWiki::defaultsetup();IkiWiki::Setup::load("file");`
 >> works (after `use IkiWiki; use IkiWiki::Setup;`). Of course the other api 
 >> is nicer.      
+
+[[done]], sorry for trouble --[[Joey]]