summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Setup.pm2
-rw-r--r--doc/bugs/IkiWiki::Setup::load__40____41___broken_outside_ikiwiki__63__.mdwn2
2 files changed, 3 insertions, 1 deletions
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index f8bb664c4..77afdd608 100644
--- 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 b92a96838..e1e29f0a4 100644
--- 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]]