diff options
| author | Joey Hess <joey@kitenet.net> | 2011-01-05 15:22:55 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-01-05 15:22:55 -0400 |
| commit | 3eabf323f057686796a7dbf9da2fbf0fed4c5728 (patch) | |
| tree | c59b5c8e9981a70b0429c5842109e76a869c508c | |
| parent | 7a88638c6c47480817fdac02d0a45f1dd56b6d1d (diff) | |
Fix permalinks to recentchanges items and comments, broken by last release.
permalinks always need to be full urls
| -rw-r--r-- | IkiWiki/Plugin/comments.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/recentchanges.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index f3d6f20d6..cdb926271 100644 --- 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 a64cbb16a..92083a7ad 100644 --- 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 33e5e1fa1..e9323014d 100644 --- 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 |