Merge branch 'master' into pedigree

[git.ikiwiki.info.git] / IkiWiki / Setup / Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 7be4f891a30848c394b78217f7bc0b9b2ea640dc..f67c3829b71d437dc73ed7477196d9323247ece4 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
 # Standard ikiwiki setup module.
 # Parameters to import should be all the standard ikiwiki config stuff,
-# plus hashes for cgiwrapper and svnwrapper, which specify any differing
-# config stuff for them and cause the wrappers to be made.
+# plus an array of wrappers to set up.
 
 package IkiWiki::Setup::Standard;
 
@@ -10,24 +9,7 @@ use warnings;
 use strict;
 
 sub import {
-       my %setup=%{$_[1]};
-
-
-       ::debug("generating wrappers..");
-       foreach my $wrapper (@{$setup{wrapper}}) {
-               ::gen_wrapper(%::config, %setup, %{$wrapper});
-       }
-
-       ::debug("rebuilding wiki..");
-       foreach my $c (keys %setup) {
-               $::config{$c}=::possibly_foolish_untaint($setup{$c})
-                       if defined $setup{$c} && ! ref $setup{$c};
-       }
-       $::config{rebuild}=1;
-       ::refresh();
-
-       ::debug("done");
-       ::saveindex();
+       $IkiWiki::Setup::raw_setup=$_[1];
 }
 
 1