urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't fail if %config is not set

master
Joey Hess 2008-08-31 22:11:59 -04:00
parent a82496d35a
commit 000c87f510
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Setup.pm
View File

@ -33,7 +33,7 @@ sub merge ($) {
# Merge setup into existing config and untaint. # Merge setup into existing config and untaint.
my %setup=%{shift()}; my %setup=%{shift()};
if (exists $setup{add_plugins}) { if (exists $setup{add_plugins} && exists $config{add_plugins}) {
push @{$setup{add_plugins}}, @{$config{add_plugins}}; push @{$setup{add_plugins}}, @{$config{add_plugins}};
} }
if (exists $setup{exclude}) { if (exists $setup{exclude}) {

2
doc/bugs/IkiWiki::Setup::load__40____41___broken_outside_ikiwiki__63__.mdwn
View File

@ -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");` >> It seems that `%config = IkiWiki::defaultsetup();IkiWiki::Setup::load("file");`
>> works (after `use IkiWiki; use IkiWiki::Setup;`). Of course the other api >> works (after `use IkiWiki; use IkiWiki::Setup;`). Of course the other api
>> is nicer. >> is nicer.
[[done]], sorry for trouble --[[Joey]]