aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-01-04 20:51:40 -0500
committerJoey Hess <joey@gnu.kitenet.net>2010-01-04 20:51:40 -0500
commitd78e8ee45275060d70686e540c94aa5aa47d9f31 (patch)
tree0b2b5141d951d2fd73bdf2a6a34e28f78c668ec9
parent5fdceb49b174fb2ece7cef07479413059f1982c7 (diff)
downloadikiwiki-d78e8ee45275060d70686e540c94aa5aa47d9f31.tar
ikiwiki-d78e8ee45275060d70686e540c94aa5aa47d9f31.tar.gz
comments: Fix permalinks for comments using new conflict-free filenames.
-rw-r--r--IkiWiki/Plugin/comments.pm2
-rw-r--r--debian/changelog1
2 files changed, 2 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 6340fc2cb..5586cca52 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -224,7 +224,7 @@ sub preprocess {
$pagestate{$page}{meta}{title} = $params{subject};
}
- if ($params{page} =~ m/\/(\Q$config{comments_pagename}\E\d+)$/) {
+ if ($params{page} =~ m/\/\Q$config{comments_pagename}\E\d+_/) {
$pagestate{$page}{meta}{permalink} = urlto(IkiWiki::dirname($params{page}), undef, 1).
"#".page_to_id($params{page});
}
diff --git a/debian/changelog b/debian/changelog
index aa4f1ac3c..f36580d26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
(Sjoerd)
* signinedit: Auto-disable the plugin when all authentication methods
are disabled.
+ * comments: Fix permalinks for comments using new conflict-free filenames.
-- Joey Hess <joeyh@debian.org> Mon, 04 Jan 2010 12:53:24 -0500