Fix permalinks to recentchanges items and comments, broken by last release.

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 93d2c326d300209cf8f6af51905ec34bccd80b64..3a4cfd5e730cd7fc04a14a94d8a3fbd71f053fc5 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -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}) {
@@ -1931,7 +1931,7 @@ sub misctemplate ($$;@) {
                title => $title,
                wikiname => $config{wikiname},
                content => $content,
-               baseurl => baseurl(),
+               baseurl => $config{url},
                html5 => $config{html5},
                %params,
        );
@@ -2033,7 +2033,7 @@ sub rcs_recentchanges ($) {
        $hooks{rcs}{rcs_recentchanges}{call}->(@_);
 }
 
-sub rcs_diff ($) {
+sub rcs_diff ($;$) {
        $hooks{rcs}{rcs_diff}{call}->(@_);
 }