From 7ed1891fb2b81514d090969aece07a8e0be894f1 Mon Sep 17 00:00:00 2001
From: dklawren <dklawren@users.noreply.github.com>
Date: Fri, 23 Mar 2018 11:15:51 -0400
Subject: Bug 1446974 - Revert changes of the subscribers list on secure
 revisions

---
 extensions/PhabBugz/lib/Feed.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'extensions/PhabBugz')

diff --git a/extensions/PhabBugz/lib/Feed.pm b/extensions/PhabBugz/lib/Feed.pm
index 323681ebc..006ab04f3 100644
--- a/extensions/PhabBugz/lib/Feed.pm
+++ b/extensions/PhabBugz/lib/Feed.pm
@@ -229,10 +229,12 @@ sub process_revision_change {
 
             my $secure_project_phid = get_project_phid('secure-revision');
             $revision->add_project($secure_project_phid);
-
-            my $subscribers = get_bug_role_phids($bug);
-            $revision->set_subscribers($subscribers);
         }
+
+        # Subscriber list of the private revision should always match
+        # the bug roles such as assignee, qa contact, and cc members.
+        my $subscribers = get_bug_role_phids($bug);
+        $revision->set_subscribers($subscribers);
     }
 
     my ($timestamp) = Bugzilla->dbh->selectrow_array("SELECT NOW()");
-- 
cgit v1.2.3-24-g4f1b