autoindex: Ignore internal pages, and take underlay directories into account. Also...

[ikiwiki.git] / IkiWiki / Setup.pm

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 02a462082cc476530d16c9d6477122727f713bf6..e014a2a10a5e59c1ce4f1285a747e698f390d34f 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -8,9 +8,11 @@ use warnings;
 use strict;
 use IkiWiki;
 use open qw{:utf8 :std};
+use File::Spec;
 
 sub load ($) { # {{{
        my $setup=IkiWiki::possibly_foolish_untaint(shift);
+       $config{setupfile}=File::Spec->rel2abs($config{setup});
        delete $config{setup};
        #translators: The first parameter is a filename, and the second
        #translators: is a (probably not translated) error message.
@@ -72,13 +74,14 @@ sub merge ($) {
 } #}}}
 
 sub getsetup () { #{{{
-       # Gets all available setup data from all plugins. Returns an ordered list of
-       # [plugin, setup] pairs.
+       # Gets all available setup data from all plugins. Returns an
+       # ordered list of [plugin, setup] pairs.
        my @ret;
 
-        # disable logging to syslog while dumping, broken plugins may whine when loaded
+        # disable logging to syslog while dumping, broken plugins may
+       # whine when loaded
        my $syslog=$config{syslog};
-        $config{syslog}=0;
+        $config{syslog}=undef;
 
        # Load all plugins, so that all setup options are available.
        my @plugins=grep { $_ ne $config{rcs} } sort(IkiWiki::listplugins());