work around CGI::Session constructor issues

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index da712e94aa784ea482f622e35fd4632ec0223635..693c4fe60a7d3a3d9f4944aac8c778d2d1a71f2e 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,36 +1,17 @@
 #!/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.
-
-package IkiWiki::Setup::Standard;
+# plus an array of wrappers to set up.
 
 use warnings;
 use strict;
+use IkiWiki::Wrapper;
+use IkiWiki::Render;
 
-sub import {
-       my %setup=%{$_[1]};
-
-       ::debug("generating wrappers..");
-       my %startconfig=(%::config);
-       foreach my $wrapper (@{$setup{wrappers}}) {
-               %::config=(%startconfig, verbose => 0, %setup, %{$wrapper});
-               ::checkoptions();
-               ::gen_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;
-       ::checkoptions();
-       ::refresh();
+package IkiWiki::Setup::Standard;
 
-       ::debug("done");
-       ::saveindex();
+sub import {
+       $IkiWiki::Setup::raw_setup=$_[1];
 }
 
 1