summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2008-12-19 17:33:40 -0500
committerJoey Hess <joey@gnu.kitenet.net>2008-12-19 17:33:40 -0500
commit301733ba13f8fdaf53df0a6058f92d305507a97f (patch)
treea65f6b6ee4e0aeec9777f97fcad8a1bad5149c63
parent0b002b79b7241ea87ce3489b75a34116c32630e6 (diff)
fix comment permalink to always point to comment parent page
-rw-r--r--IkiWiki/Plugin/comments.pm2
-rw-r--r--doc/todo/comments.mdwn4
2 files changed, 2 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 50c048fee..c50729a34 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -194,7 +194,7 @@ sub preprocess {
}
if ($params{page} =~ m/\/(\Q$config{comments_pagename}\E\d+)$/) {
- $pagestate{$page}{meta}{permalink} = urlto($params{destpage}, undef, 1).
+ $pagestate{$page}{meta}{permalink} = urlto(IkiWiki::dirname($params{page}), undef, 1).
"#".$params{page};
}
diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 81c2f2722..aa6b130dc 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -53,9 +53,7 @@ Known issues with the [[plugins/comments]] plugin:
(BTW, the rss feed in this situation seems ok; there the link element
points back to the parent page.
- > done
- > Er, no, I added a link but it does not go back to the parent page of a
- > comment if the comment is inlined elsewhere. --[[Joey]]
+ > done --[[Joey]]
* It would be useful to have a pagespec that always matches all comments on
pages matching a glob. Something like `comment(blog/*)`.