web commit by joey

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d5135f3eb8de14acdda1d6ac37aee45d192eb6bb..c5a67afdf7cce69f4e1fea08f7dae4b377f14111 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -24,7 +24,7 @@ sub setup_standard {
        my %startconfig=(%config);
        foreach my $wrapper (@{$setup{wrappers}}) {
                %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
        my %startconfig=(%config);
        foreach my $wrapper (@{$setup{wrappers}}) {
                %config=(%startconfig, verbose => 0, %setup, %{$wrapper});

-               checkoptions();
+               checkconfig();

                gen_wrapper();
        }
        %config=(%startconfig);
                gen_wrapper();
        }
        %config=(%startconfig);


@@ -36,8 +36,9 @@ sub setup_standard {
        }
        $config{rebuild}=1;
 
        }
        $config{rebuild}=1;
 

-       checkoptions();
+       checkconfig();

        lockwiki();
        lockwiki();

+       loadindex();

        refresh();
 
        debug("done");
        refresh();
 
        debug("done");