Bug 329022: Remove group_name_to_id in favor of creating Group objects - Patch by Rémi Zara <remi_zara@mac.com> r=LpSolit a=justdave

3 files changed, 3 insertions, 29 deletions

diff --git a/Bugzilla/Group.pm b/Bugzilla/Group.pm
index b561f0040..31b031381 100644
--- a/Bugzilla/Group.pm
+++ b/Bugzilla/Group.pm
@@ -25,11 +25,6 @@ use strict;
 
 package Bugzilla::Group;
 
-use base qw(Exporter);
-@Bugzilla::Group::EXPORT = qw(
-    group_name_to_id
-);
-
 use Bugzilla::Config;
 use Bugzilla::Util;
 use Bugzilla::Error;
@@ -145,14 +140,6 @@ sub get_all_groups {
     return @groups;
 }
 
-sub group_name_to_id {
-    my ($name) = @_;
-    trick_taint($name);
-    my ($id) = Bugzilla->dbh->selectrow_array(
-        "SELECT id FROM groups WHERE name = ?", undef, $name);
-    return $id;
-}
-
 1;
 
 __END__
@@ -177,7 +164,6 @@ Bugzilla::Group - Bugzilla group class.
 
     my $group_id = Bugzilla::Group::ValidateGroupName('admin', @users);
     my @groups   = Bugzilla::Group::get_all_groups();
-    my $group_id = group_name_to_id('admin');
 
 =head1 DESCRIPTION
 
@@ -227,18 +213,6 @@ Group.pm represents a Bugzilla Group object.
 
  Returns:     An array of group objects.
 
-=item C<group_name_to_id($name)>
-
- Description: Converts a group name to an id.
-              In general, instead of using this function, you should
-              create a Group object and get its name. This function
-              does not offer any real performance advantage.
-
- Params:      $name - The name of a group.
-
- Returns:     The numeric id of the group with that name,
-              or C<undef> if the group does not exist.
-
 =back
 
 =cut
diff --git a/editgroups.cgi b/editgroups.cgi
index a2b33b3f9..d28d95f19 100755
--- a/editgroups.cgi
+++ b/editgroups.cgi
@@ -294,7 +294,7 @@ if ($action eq 'new') {
               undef, ($name, $desc, $regexp, $isactive));
 
     my $gid = $dbh->bz_last_key('groups', 'id');
-    my $admin = group_name_to_id('admin');
+    my $admin = Bugzilla::Group->new({name => 'admin'})->id();
     # Since we created a new group, give the "admin" group all privileges
     # initially.
     my $sth = $dbh->prepare('INSERT INTO group_group_map
diff --git a/editproducts.cgi b/editproducts.cgi
index 68e6bd42a..30b3d32a6 100755
--- a/editproducts.cgi
+++ b/editproducts.cgi
@@ -235,7 +235,7 @@ if ($action eq 'new') {
     if (Param("makeproductgroups")) {
         # Next we insert into the groups table
         my $productgroup = $product->name;
-        while (group_name_to_id($productgroup)) {
+        while (new Bugzilla::Group({name => $productgroup})) {
             $productgroup .= '_';
         }
         my $group_description = "Access to bugs in the " .
@@ -250,7 +250,7 @@ if ($action eq 'new') {
 
         # If we created a new group, give the "admin" group priviledges
         # initially.
-        my $admin = group_name_to_id('admin');
+        my $admin = Bugzilla::Group->new({name => 'admin'})->id();
         
         my $sth = $dbh->prepare('INSERT INTO group_group_map
                                  (member_id, grantor_id, grant_type)