X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/e4d9da55d923cdd78cd07959de44edf17a9a5fe5..da1f96550e15f6b02156cd0f77df9a6bc6a6b079:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 76213b11a..c5a67afdf 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -4,32 +4,45 @@
 # plus hashes for cgiwrapper and svnwrapper, which specify any differing
 # config stuff for them and cause the wrappers to be made.
 
-package IkiWiki::Setup::Standard;
-
 use warnings;
 use strict;
+use IkiWiki::Wrapper;
+use IkiWiki::Render;
+
+package IkiWiki::Setup::Standard;
 
 sub import {
+	IkiWiki::setup_standard(@_);
+}
+	
+package IkiWiki;
+
+sub setup_standard {
 	my %setup=%{$_[1]};
 
-	::debug("generating wrappers..");
+	debug("generating wrappers..");
+	my %startconfig=(%config);
 	foreach my $wrapper (@{$setup{wrappers}}) {
-		%::config=(%::config, verbose => 0, %setup, %{$wrapper});
-		::checkoptions();
-		::gen_wrapper();
+		%config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+		checkconfig();
+		gen_wrapper();
 	}
-
-	::debug("rebuilding wiki..");
+	%config=(%startconfig);
+	
+	debug("rebuilding wiki..");
 	foreach my $c (keys %setup) {
-		$::config{$c}=::possibly_foolish_untaint($setup{$c})
+		$config{$c}=possibly_foolish_untaint($setup{$c})
 			if defined $setup{$c} && ! ref $setup{$c};
 	}
-	$::config{rebuild}=1;
-	::checkoptions();
-	::refresh();
+	$config{rebuild}=1;
+
+	checkconfig();
+	lockwiki();
+	loadindex();
+	refresh();
 
-	::debug("done");
-	::saveindex();
+	debug("done");
+	saveindex();
 }
 
 1