web commit by simon

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 87db648e0accc2c177f2f55e8c6dc712863a0326..0a34968855a2cd26ac4609d27b73b2d0e440ea76 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -63,20 +63,25 @@ sub setup_standard {
                        $config{$c}=undef;
                }
        }
                        $config{$c}=undef;
                }
        }

+       
+       if (! $config{refresh}) {
+               $config{rebuild}=1;
+       }
+       
+       loadplugins();
+       checkconfig();

 
        if ($config{render}) {
                commandline_render();
        }
 
        if ($config{render}) {
                commandline_render();
        }

-       elsif (! $config{refresh}) {
-               $config{rebuild}=1;
+
+       if (! $config{refresh}) {

                debug(gettext("rebuilding wiki.."));
        }
        else {
                debug(gettext("refreshing wiki.."));
        }
 
                debug(gettext("rebuilding wiki.."));
        }
        else {
                debug(gettext("refreshing wiki.."));
        }
 

-       loadplugins();
-       checkconfig();

        lockwiki();
        loadindex();
        refresh();
        lockwiki();
        loadindex();
        refresh();