Bug 332521: Remove GroupIdToName() from globals.pl - Patch by Frédéric Buclin <LpSolit@gmail.com> r=mkanat a=myk

1 files changed, 8 insertions, 8 deletions

diff --git a/editproducts.cgi b/editproducts.cgi
index 9123f034f..942375688 100755
--- a/editproducts.cgi
+++ b/editproducts.cgi
@@ -660,11 +660,12 @@ if ($action eq 'updategroupcontrols') {
         my $bugs = $dbh->selectall_arrayref($sth_Select, undef,
                                             ($groupid, $product->id));
 
+        my ($removed, $timestamp) =
+            $dbh->selectrow_array($sth_Select2, undef, $groupid);
+
         foreach my $bug (@$bugs) {
             my ($bugid, $mailiscurrent) = @$bug;
             $sth_Delete->execute($bugid, $groupid);
-            my ($removed, $timestamp) =
-                $dbh->selectrow_array($sth_Select2, undef, $groupid);
 
             LogActivityEntry($bugid, "bug_group", $removed, "",
                              $whoid, $timestamp);
@@ -677,8 +678,7 @@ if ($action eq 'updategroupcontrols') {
             }
             $count++;
         }
-        my %group = (name => GroupIdToName($groupid),
-                     bug_count => $count);
+        my %group = (name => $removed, bug_count => $count);
 
         push(@removed_na, \%group);
     }
@@ -703,11 +703,12 @@ if ($action eq 'updategroupcontrols') {
         my $bugs = $dbh->selectall_arrayref($sth_Select, undef,
                                             ($groupid, $product->id));
 
+        my ($added, $timestamp) =
+            $dbh->selectrow_array($sth_Select2, undef, $groupid);
+
         foreach my $bug (@$bugs) {
             my ($bugid, $mailiscurrent) = @$bug;
             $sth_Insert->execute($bugid, $groupid);
-            my ($added, $timestamp) =
-                $dbh->selectrow_array($sth_Select2, undef, $groupid);
 
             LogActivityEntry($bugid, "bug_group", "", $added,
                              $whoid, $timestamp);
@@ -720,8 +721,7 @@ if ($action eq 'updategroupcontrols') {
             }
             $count++;
         }
-        my %group = (name => GroupIdToName($groupid),
-                     bug_count => $count);
+        my %group = (name => $added, bug_count => $count);
 
         push(@added_mandatory, \%group);
     }