X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/4ef96e2d9994c407f0f2f46301eb91fab6b48a37..12c5786df4e74c143f24398b8d0028000b61daba:/IkiWiki/Setup.pm

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 38b715202..c2fd59b21 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -9,12 +9,6 @@ use strict;
 use IkiWiki;
 use open qw{:utf8 :std};
 
-# There can be multiple modules, with different configuration styles.
-# The setup modules each convert the data into the hashes used by ikiwiki
-# internally (if it's not already in that format), and store it in
-# IkiWiki::Setup::$raw_setup, to pass it back to this module.
-our $raw_setup;
-
 sub load ($) { # {{{
 	my $setup=IkiWiki::possibly_foolish_untaint(shift);
 	delete $config{setup};
@@ -31,9 +25,10 @@ sub load ($) { # {{{
 
 	eval $code;
 	error("$setup: ".$@) if $@;
+} #}}}
 
-	my %setup=%{$raw_setup};
-	$raw_setup=undef;
+sub merge ($) {
+	my %setup=%{shift()};
 
 	# Merge setup into existing config and untaint.
 	if (exists $setup{add_plugins}) {