diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-08-31 22:11:59 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-09-01 11:26:03 -0400 |
| commit | 000c87f510bee6085030e084041d595146984a26 (patch) | |
| tree | a40f8331e8d6d113d1ca08a214418a41d367856b /IkiWiki | |
| parent | a82496d35a39667fb5851334207fc9bb4573cebc (diff) | |
don't fail if %config is not set
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Setup.pm | 2 |
1 files changed, 1 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}) { |