aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Setup.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-08-31 22:11:59 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-09-01 11:26:03 -0400
commit000c87f510bee6085030e084041d595146984a26 (patch)
treea40f8331e8d6d113d1ca08a214418a41d367856b /IkiWiki/Setup.pm
parenta82496d35a39667fb5851334207fc9bb4573cebc (diff)
downloadikiwiki-000c87f510bee6085030e084041d595146984a26.tar
ikiwiki-000c87f510bee6085030e084041d595146984a26.tar.gz
don't fail if %config is not set
Diffstat (limited to 'IkiWiki/Setup.pm')
-rw-r--r--IkiWiki/Setup.pm2
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}) {