X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=IkiWiki%2FSetup%2FStandard.pm;h=56ed5ab3b553e7f17b3b257cc82ee94049821770;hp=da712e94aa784ea482f622e35fd4632ec0223635;hb=28055bbcc5c8e6371c7eaa7a0465a9e311a01764;hpb=8978c1d959bd016fade8d3db39da50680a7314a5

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index da712e94a..56ed5ab3b 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -4,33 +4,44 @@
 # 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..");
-	my %startconfig=(%::config);
+	debug("generating wrappers..");
+	my %startconfig=(%config);
 	foreach my $wrapper (@{$setup{wrappers}}) {
-		%::config=(%startconfig, 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();
+	refresh();
 
-	::debug("done");
-	::saveindex();
+	debug("done");
+	saveindex();
 }
 
 1