Bug 365890: Searches shared by users with bless rights are in the footer by default, with no warning - Patch by Teemu Mannermaa <wicked@sci.fi> r/a=LpSolit

1 files changed, 4 insertions, 4 deletions

diff --git a/userprefs.cgi b/userprefs.cgi
index 1ad7f906e..8f2e69f1e 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -399,6 +399,7 @@ sub DoSavedSearches {
         $vars->{'queryshare_groups'} =
             Bugzilla::Group->new_from_list($user->queryshare_groups);
     }
+    $vars->{'bless_group_ids'} = [map {$_->{'id'}} @{$user->bless_groups}];
 }
 
 sub SaveSavedSearches {
@@ -458,10 +459,9 @@ sub SaveSavedSearches {
             }
 
             # If we're sharing our query with a group we can bless, we 
-            # subscribe direct group members to our search automatically.
-            # Otherwise, the group members need to opt in. This behaviour 
-            # is deemed most likely to fit users' needs.
-            if ($user->can_bless($group_id)) {
+            # have the ability to add link to our search to the footer of
+            # direct group members automatically.
+            if ($user->can_bless($group_id) && $cgi->param('force_' . $q->id)) {
                 my $group = new Bugzilla::Group($group_id);
                 my $members = $group->members_non_inherited;
                 foreach my $member (@$members) {