From 4769d007bce5a1ebb449b53d5a5fe8b552bc74e7 Mon Sep 17 00:00:00 2001
From: Dylan Hardison <dylan@mozilla.com>
Date: Fri, 11 Apr 2014 16:02:08 -0400
Subject: Bug 993940 -  backport 428490 to bmo (Group icons should be displayed
 for indirect memberships, too)

r=dkl
---
 Bugzilla/User.pm | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

(limited to 'Bugzilla/User.pm')

diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 0429a25e3..b097ffaad 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -832,7 +832,8 @@ sub in_group_id {
 # besides the name of the commenter.
 sub groups_with_icon {
     my $self = shift;
-    return $self->{groups_with_icon} //= [grep { $_->icon_url } @{ $self->direct_group_membership }];
+
+    return $self->{groups_with_icon} //= [grep { $_->icon_url } @{ $self->groups }];
 }
 
 sub get_products_by_permission {
@@ -1209,24 +1210,6 @@ sub can_set_flag {
             || $self->in_group_id($flag_type->grant_group_id)) ? 1 : 0;
 }
 
-sub direct_group_membership {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-
-    if (!$self->{'direct_group_membership'}) {
-        my $gid = $dbh->selectcol_arrayref('SELECT id
-                                              FROM groups
-                                        INNER JOIN user_group_map
-                                                ON groups.id = user_group_map.group_id
-                                             WHERE user_id = ?
-                                               AND isbless = 0',
-                                             undef, $self->id);
-        $self->{'direct_group_membership'} = Bugzilla::Group->new_from_list($gid);
-    }
-    return $self->{'direct_group_membership'};
-}
-
-
 # visible_groups_inherited returns a reference to a list of all the groups
 # whose members are visible to this user.
 sub visible_groups_inherited {
@@ -2624,11 +2607,6 @@ Returns a reference to an array of users.  The array is populated with hashrefs
 containing the login, identity and visibility.  Users that are not visible to this
 user will have 'visible' set to zero.
 
-=item C<direct_group_membership>
-
-Returns a reference to an array of group objects. Groups the user belong to
-by group inheritance are excluded from the list.
-
 =item C<visible_groups_inherited>
 
 Returns a list of all groups whose members should be visible to this user.
-- 
cgit v1.2.3-24-g4f1b