Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index ee53dbc91e4e0b6768e36d23705da64a02cf0e1b..5782d90834c70546f0c19cc40c400a2bc5e799ff 100644 (file)
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -672,7 +672,7 @@ sub previewcomment ($$$) {
 sub commentsshown ($) {
        my $page=shift;
 
-       return ! pagespec_match($page, "*/$config{comments_pagename}*",
+       return ! pagespec_match($page, "internal(*/$config{comments_pagename}*)",
                                location => $page) &&
               pagespec_match($page, $config{comments_pagespec},
                              location => $page);

diff --git a/debian/changelog b/debian/changelog
index 01404a2b4665f1b6448e5613c717489e46fac697..4ba32c8d628bbbcf49e3c78d8b9446b588e69e13 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ ikiwiki (3.09) UNRELEASED; urgency=low
     not last commit time.
   * Updated French translation (Jean-Luc Coulon). Closes: #521072
   * css: Add clear: both to inlinefooter.
+  * comments: Fix too loose test for comments pages that matched
+    normal pages with "comment_" in their name. Closes: #521322
 
  -- Joey Hess <joeyh@debian.org>  Thu, 19 Mar 2009 15:32:49 -0400