From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 8 May 2008 20:08:02 +0000 (-0400)
Subject: load plugins before printing messages
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/b7950d8d01875747cfe74328358c3ff0304e4ad4

load plugins before printing messages

This allows plugins to getopt and change what is done before an incorrect
line is printed.
---

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8591731dc..eb01a4227 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -508,8 +508,6 @@ sub refresh () { #{{{
 } #}}}
 
 sub commandline_render () { #{{{
-	loadplugins();
-	checkconfig();
 	lockwiki();
 	loadindex();
 	unlockwiki();
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 87db648e0..fb542be20 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -63,11 +63,15 @@ sub setup_standard {
 			$config{$c}=undef;
 		}
 	}
+	
+	loadplugins();
+	checkconfig();
 
 	if ($config{render}) {
 		commandline_render();
 	}
-	elsif (! $config{refresh}) {
+
+	if (! $config{refresh}) {
 		$config{rebuild}=1;
 		debug(gettext("rebuilding wiki.."));
 	}
@@ -75,8 +79,6 @@ sub setup_standard {
 		debug(gettext("refreshing wiki.."));
 	}
 
-	loadplugins();
-	checkconfig();
 	lockwiki();
 	loadindex();
 	refresh();