Bug 1219276: Creating a new group fails if a custom extension adds entries to group_control_map and "insertnew" is selected

r=LpSolit a=dkl

1 files changed, 1 insertions, 7 deletions

diff --git a/editgroups.cgi b/editgroups.cgi
index 287ac1114..35989b954 100755
--- a/editgroups.cgi
+++ b/editgroups.cgi
@@ -194,15 +194,9 @@ if ($action eq 'new') {
         isactive    => scalar $cgi->param('isactive'),
         icon_url    => scalar $cgi->param('icon_url'),
         isbuggroup  => 1,
+        use_in_all_products => scalar $cgi->param('insertnew'),
     });
 
-    # Permit all existing products to use the new group if makeproductgroups.
-    if ($cgi->param('insertnew')) {
-        $dbh->do('INSERT INTO group_control_map
-                  (group_id, product_id, membercontrol, othercontrol)
-                  SELECT ?, products.id, ?, ? FROM products',
-                  undef, ($group->id, CONTROLMAPSHOWN, CONTROLMAPNA));
-    }
     delete_token($token);
 
     $vars->{'message'} = 'group_created';