diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-03-26 14:04:28 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-03-26 14:04:28 -0400 |
| commit | 503d83ffbc358714ad84e46ce523b8702268edb6 (patch) | |
| tree | a7b0b5be1945eecccf0274208926ab2f87063210 | |
| parent | 9e4adba63a769f164c2a6818e58070680c3e0eed (diff) | |
comments: Fix too loose test for comments pages that matched normal pages with "comment_" in their name. Closes: #521322
| -rw-r--r-- | IkiWiki/Plugin/comments.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index ee53dbc91..5782d9083 100644 --- 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 01404a2b4..4ba32c8d6 100644 --- 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 |