projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tova' into autoconfig
[ikiwiki.git]
/
ikiwiki.in
diff --git
a/ikiwiki.in
b/ikiwiki.in
index 0390df7e1f64d4755620857aed20b7b8576dae4c..d8e848f8727c5dbfd11bc0f9ce976e0821b68cff 100755
(executable)
--- a/
ikiwiki.in
+++ b/
ikiwiki.in
@@
-116,6
+116,10
@@
sub main () { #{{{
if ($config{setup}) {
require IkiWiki::Setup;
IkiWiki::Setup::load($config{setup});
if ($config{setup}) {
require IkiWiki::Setup;
IkiWiki::Setup::load($config{setup});
+
+ loadplugins();
+ checkconfig();
+
if (@{$config{wrappers}} &&
! $config{render} && ! $config{dumpsetup} &&
(! $config{refresh} || $config{genwrappers})) {
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};
# ignore syslog setting from setup file
# while doing initial setup
$config{syslog}=0 unless $config{dumpsetup};
-
- loadplugins();
- checkconfig();
}
if ($config{dumpsetup}) {
}
if ($config{dumpsetup}) {