X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/170a6de6ab040e4d8e173a28d128c4ae07ac4191..4ed0a630cb8a10d583c5e88cc7a87a5cecdedc8d:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index a13e7805a..f67c3829b 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -3,51 +3,13 @@
 # Parameters to import should be all the standard ikiwiki config stuff,
 # plus an array of wrappers to set up.
 
+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]};
-
-	if (! $config{refresh}) {
-		debug("generating wrappers..");
-		my %startconfig=(%config);
-		foreach my $wrapper (@{$setup{wrappers}}) {
-			%config=(%startconfig, verbose => 0, %setup, %{$wrapper});
-			checkconfig();
-			gen_wrapper();
-		}
-		%config=(%startconfig);
-	}
-	foreach my $c (keys %setup) {
-		$config{$c}=possibly_foolish_untaint($setup{$c})
-			if defined $setup{$c} && ! ref $setup{$c};
-	}
-	if (! $config{refresh}) {
-		$config{rebuild}=1;
-		debug("rebuilding wiki..");
-	}
-	else {
-		debug("refreshing wiki..");
-	}
-
-	checkconfig();
-	lockwiki();
-	loadindex();
-	refresh();
-
-	debug("done");
-	saveindex();
+	$IkiWiki::Setup::raw_setup=$_[1];
 }
 
 1