Merge lp:~stevenk/launchpad/kill-malone.bugmessage_owner into lp:launchpad

[Steve Kowalik]

[r=henninge][bug=814804] Drop the malone.bugmessage_owner feature flag.

The malone.bugmessage_owner feature flag is undocumented and enabled for everyone, so let's remove it.

[Henning Eggers (henninge)]

Great, thanks!

review: Approve

=== modified file 'lib/lp/bugs/model/bugtask.py'
--- lib/lp/bugs/model/bugtask.py	2011-09-07 15:40:13 +0000
+++ lib/lp/bugs/model/bugtask.py	2011-09-09 13:15:16 +0000
@@ -2079,25 +2079,10 @@
             extra_clauses.append(bug_reporter_clause)
 
         if params.bug_commenter:
-            bugmessage_owner = bool(features.getFeatureFlag(
-                'malone.bugmessage_owner'))
-            bug_commenter_old_clause = """
-            BugTask.id IN (
-                SELECT DISTINCT BugTask.id FROM BugTask, BugMessage, Message
-                WHERE Message.owner = %(bug_commenter)s
-                    AND Message.id = BugMessage.message
-                    AND BugTask.bug = BugMessage.bug
-                    AND BugMessage.index > 0
-            )
-            """ % sqlvalues(bug_commenter=params.bug_commenter)
-            bug_commenter_new_clause = """
+            bug_commenter_clause = """
             Bug.id IN (SELECT DISTINCT bug FROM Bugmessage WHERE
             BugMessage.index > 0 AND BugMessage.owner = %(bug_commenter)s)
             """ % sqlvalues(bug_commenter=params.bug_commenter)
-            if bugmessage_owner:
-                bug_commenter_clause = bug_commenter_new_clause
-            else:
-                bug_commenter_clause = bug_commenter_old_clause
             extra_clauses.append(bug_commenter_clause)
 
         if params.affects_me: