aboutsummaryrefslogtreecommitdiff
path: root/ikiwiki.in
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-27 01:52:36 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-27 01:52:36 -0400
commit6040886c725c6b6a179bf164a34be20dd161f1e2 (patch)
tree6a8231206dff2eca8d2da0c99341c7f4073609a0 /ikiwiki.in
parent3d139e43126f2bd18b28feb187425fb22a7dd929 (diff)
downloadikiwiki-6040886c725c6b6a179bf164a34be20dd161f1e2.tar
ikiwiki-6040886c725c6b6a179bf164a34be20dd161f1e2.tar.gz
checkconfig before wrapper setup
Necessary now that the plugins control what wrappers are built.
Diffstat (limited to 'ikiwiki.in')
-rwxr-xr-xikiwiki.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/ikiwiki.in b/ikiwiki.in
index 0390df7e1..d8e848f87 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -116,6 +116,10 @@ sub main () { #{{{
if ($config{setup}) {
require IkiWiki::Setup;
IkiWiki::Setup::load($config{setup});
+
+ loadplugins();
+ checkconfig();
+
if (@{$config{wrappers}} &&
! $config{render} && ! $config{dumpsetup} &&
(! $config{refresh} || $config{genwrappers})) {
@@ -148,9 +152,6 @@ sub main () { #{{{
# ignore syslog setting from setup file
# while doing initial setup
$config{syslog}=0 unless $config{dumpsetup};
-
- loadplugins();
- checkconfig();
}
if ($config{dumpsetup}) {