X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9e0cbb73fe550d05e668d3584ef6f7981e781c8e..9802fbee404cc20027634eba7f58b78c569b7c5f:/IkiWiki/Setup.pm diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm index d2d1e4b8e..e014a2a10 100644 --- 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. @@ -79,7 +81,7 @@ sub getsetup () { #{{{ # 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());