Add patch

[ikiwiki.git] / IkiWiki / Setup.pm

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index f8bb664c4b46bc716aa6a02fe745ce3483afe794..77afdd6084e94084ba8e6a09b8bba632f3adcbfc 100644 (file)
--- 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}) {