diff options
| author | Joey Hess <joey@kitenet.net> | 2010-12-26 13:53:31 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-12-26 13:53:31 -0400 |
| commit | 9982862925627d4714ed8b61d8b591950ed5aaa5 (patch) | |
| tree | 195e8b18aee65aa2317e1287ea88393be286c1de /IkiWiki.pm | |
| parent | 5df0718abf13e01515ddb13659949908dba92cf8 (diff) | |
| parent | be6ca4c4e99c40f4c4763147c798a6f144dadc0c (diff) | |
Merge remote branch 'smcv/ready/urlto'
Diffstat (limited to 'IkiWiki.pm')
| -rw-r--r-- | IkiWiki.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 926d42a49..bbe1ad055 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -544,7 +544,7 @@ sub checkconfig () { error(gettext("Must specify url to wiki with --url when using --cgi")); } - if (length $config{url}) { + if (defined $config{url} && length $config{url}) { eval q{use URI}; my $baseurl = URI->new($config{url}); @@ -1140,7 +1140,7 @@ sub urlto ($;$$) { my $absolute=shift; if (! length $to) { - return beautify_urlpath(baseurl($from)."index.$config{htmlext}"); + $to = 'index'; } if (! $destsources{$to}) { |