From 000c87f510bee6085030e084041d595146984a26 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 31 Aug 2008 22:11:59 -0400 Subject: don't fail if %config is not set --- IkiWiki/Setup.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'IkiWiki') 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}) { -- cgit v1.2.3