]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
fixes
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 26 Jul 2008 16:53:07 +0000 (12:53 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 26 Jul 2008 16:53:07 +0000 (12:53 -0400)
IkiWiki/Setup/Standard.pm
ikiwiki.in

index dcb278bf48e2e7faae969cba7515e9ace98e149f..0e091b994134fcce7d3b4d59ffd0504e9712b4f8 100644 (file)
@@ -7,13 +7,12 @@ package IkiWiki::Setup::Standard;
 
 use warnings;
 use strict;
+use IkiWiki;
 
 sub import { #{{{
        $IkiWiki::Setup::raw_setup=$_[1];
 } #}}}
 
-package IkiWiki::Setup;
-
 sub dumpline ($$$) { #{{{
        my $key=shift;
        my $value=shift;
index 0f82f77ac538a90cc8c7d7c3d3c6ab9f1433bb00..8066bbc6e096d0ab51a5fb72f97d642042e1ccaf 100755 (executable)
@@ -149,9 +149,8 @@ sub main () { #{{{
        }
 
        if ($config{dumpsetup}) {
-               loadplugins();
-               checkconfig();
-               IkiWiki::Setup::dump($config{dumpsetup});
+               require IkiWiki::Setup::Standard;
+               IkiWiki::Setup::Standard::dump($config{dumpsetup});
        }
        elsif ($config{wrapper}) {
                lockwiki();