From: Joey Hess Date: Thu, 17 May 2012 00:18:59 +0000 (-0400) Subject: revert random bug fix X-Git-Tag: 3.20100815.9~8 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ceb9d87152204157cf86a83ce86c34a614534d67 revert random bug fix That was a bad bug, but the security team probably won't accept it in an unrelated security update. --- diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index 06a2b1bd9..29c9d4f40 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -959,8 +959,7 @@ sub match_comment ($$;@) { } } - return match_glob($page, "$glob/*", internal => 1, @_) && - ! match_glob($page, "$glob/*/*", internal => 1, @_); + return match_glob($page, "$glob/*", internal => 1, @_); } sub match_comment_pending ($$;@) { @@ -975,8 +974,7 @@ sub match_comment_pending ($$;@) { return IkiWiki::FailReason->new("$page is not a pending comment"); } - return match_glob($page, "$glob/*", internal => 1, @_) && - ! match_glob($page, "$glob/*/*", internal => 1, @_); + return match_glob($page, "$glob/*", internal => 1, @_); } 1 diff --git a/debian/changelog b/debian/changelog index 910736f82..3dac4c400 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,3 @@ -ikiwiki (3.20110226) UNRELEASED; urgency=low - - * comment: Don't show comments of subpages on parent pages. - (Fixes bug introduced in version 3.20100505.) - - -- Joey Hess Sun, 27 Feb 2011 18:14:05 -0400 - ikiwiki (3.20100815.8) stable-security; urgency=low * ikiwiki-mass-rebuild: Fix tty hijacking vulnerability by using su.