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 06a2b1bd9bfe5a5a5815f88f983012294124924b..29c9d4f40012b096dba442298f5addd2206d2252 100644 (file)
--- 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 910736f827249d5d55914b8303aee967900af12f..3dac4c400d684b3221a60adf7e76069ba4c804bf 100644 (file)
--- 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 <joeyh@debian.org>  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.