Bug 185760: New group system doesn't upgrade transparently if usebuggroups = 0

checksetup.pl

@@ -3472,15 +3472,13 @@ if (TableExists("attachstatuses") && TableExists("attachstatusdefs")) {
 
 # 2002-11-24 - bugreport@peshkin.net - bug 147275 
 #
-if (Param('makeproductgroups')) {
-    # If makeproductgroups is enabled and group_control_map is empty,
-    # backward-compatbility usebuggroups-equivalent records should
-    # be created.
-    my $entry = Param('useentrygroupdefault');
-    $sth = $dbh->prepare("SELECT COUNT(*) FROM group_control_map");
-    $sth->execute();
-    my ($mapcnt) = $sth->fetchrow_array();
-    if ($mapcnt == 0) {
+# If group_control_map is empty, backward-compatbility 
+# usebuggroups-equivalent records should be created.
+my $entry = Param('useentrygroupdefault');
+$sth = $dbh->prepare("SELECT COUNT(*) FROM group_control_map");
+$sth->execute();
+my ($mapcnt) = $sth->fetchrow_array();
+if ($mapcnt == 0) {
     # Initially populate group_control_map.
     # First, get all the existing products and their groups.
     $sth = $dbh->prepare("SELECT groups.id, products.id, groups.name, " .
@@ -3515,7 +3513,6 @@ if (Param('makeproductgroups')) {
             }
         }
     }
-    }
 }
 
 # If you had to change the --TABLE-- definition in any way, then add your