X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/83888b75f10668df39c3a1e520e7748385bab9df..3190e5cea75a43d38f58b8a45fbc87d5527d18f0:/IkiWiki/Setup.pm

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index e014a2a10..77afdd608 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -12,8 +12,8 @@ use File::Spec;
 
 sub load ($) { # {{{
 	my $setup=IkiWiki::possibly_foolish_untaint(shift);
-	$config{setupfile}=File::Spec->rel2abs($config{setup});
-	delete $config{setup};
+	$config{setupfile}=File::Spec->rel2abs($setup);
+
 	#translators: The first parameter is a filename, and the second
 	#translators: is a (probably not translated) error message.
 	open (IN, $setup) || error(sprintf(gettext("cannot read %s: %s"), $setup, $!));
@@ -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}) {