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

permalinks always need to be full urls

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index f3d6f20d6a3d9dab224e5ddff140f1a86edb772e..cdb9262710bd4f86ef4ded3e36833331dcce9d82 100644 (file)
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -237,7 +237,7 @@ sub preprocess {
        }
 
        if ($params{page} =~ m/\/\Q$config{comments_pagename}\E\d+_/) {
-               $pagestate{$page}{meta}{permalink} = urlto(IkiWiki::dirname($params{page})).
+               $pagestate{$page}{meta}{permalink} = urlto(IkiWiki::dirname($params{page}), undef, 1).
                        "#".page_to_id($params{page});
        }
 

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index a64cbb16a4c98c2634a6165ccc3633d4abc4932c..92083a7ad6ad5c9bf33743489b9ac2a143366f11 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -225,7 +225,7 @@ sub store ($$$) {
                wikiname => $config{wikiname},
        );
        
-       $template->param(permalink => urlto($config{recentchangespage}, undef)."#change-".titlepage($change->{rev}))
+       $template->param(permalink => urlto($config{recentchangespage}, undef, 1)."#change-".titlepage($change->{rev}))
                if exists $config{url};
        
        IkiWiki::run_hooks(pagetemplate => sub {

diff --git a/debian/changelog b/debian/changelog
index 33e5e1fa11817fb5972f8371f368ee5c7048e875..e9323014dc7a29e268899604279cec5f9d6c6ba7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ikiwiki (3.20101232) UNRELEASED; urgency=low
   * Temporarily revert one part of the multiple url support in the last
     release. Non-edit pages are now back to having `<base>` set to
     the site's main url.
+  * Fix permalinks to recentchanges items and comments, broken by last
+    release.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 04 Jan 2011 16:00:55 -0400