1 files changed, 18 insertions, 14 deletions

diff --git a/editcomponents.cgi b/editcomponents.cgi
index 1c45a311a..2d7e9d81b 100755
--- a/editcomponents.cgi
+++ b/editcomponents.cgi
@@ -481,10 +481,9 @@ if ($action eq 'del') {
         print "  <TD VALIGN=\"top\">Initial QA contact:</TD>\n";
         print "  <TD VALIGN=\"top\">$initialqacontact</TD>";
     }
-    SendSQL("SELECT count(bug_id),product,component
+    SendSQL("SELECT count(bug_id)
              FROM bugs
-             GROUP BY product
-             HAVING product=" . SqlQuote($product) . "
+             WHERE product=" . SqlQuote($product) . "
                 AND component=" . SqlQuote($component));
 
     print "</TR><TR>\n";
@@ -568,29 +567,34 @@ if ($action eq 'delete') {
     # so I have to iterate over bugs and delete all the indivial entries
     # in bugs_activies and attachments.
 
-    SendSQL("SELECT bug_id
+    if (Param("allowbugdeletion")) {
+        SendSQL("SELECT bug_id
              FROM bugs
              WHERE product=" . SqlQuote($product) . "
                AND component=" . SqlQuote($component));
-    while (MoreSQLData()) {
-        my $bugid = FetchOneColumn();
+        while (MoreSQLData()) {
+            my $bugid = FetchOneColumn();
 
-        my $query = $::db->query("DELETE FROM attachments WHERE bug_id=$bugid")
+            my $query =
+                $::db->query("DELETE FROM attachments WHERE bug_id=$bugid")
                 or die "$::db_errstr";
-        $query = $::db->query("DELETE FROM bugs_activity WHERE bug_id=$bugid")
+            $query =
+                $::db->query("DELETE FROM bugs_activity WHERE bug_id=$bugid")
                 or die "$::db_errstr";
-        $query = $::db->query("DELETE FROM dependencies WHERE blocked=$bugid")
+            $query =
+                $::db->query("DELETE FROM dependencies WHERE blocked=$bugid")
                 or die "$::db_errstr";
-    }
-    print "Attachments, bug activity and dependencies deleted.<BR>\n";
+        }
+        print "Attachments, bug activity and dependencies deleted.<BR>\n";
 
 
-    # Deleting the rest is easier:
+        # Deleting the rest is easier:
 
-    SendSQL("DELETE FROM bugs
+        SendSQL("DELETE FROM bugs
              WHERE product=" . SqlQuote($product) . "
                AND component=" . SqlQuote($component));
-    print "Bugs deleted.<BR>\n";
+        print "Bugs deleted.<BR>\n";
+    }
 
     SendSQL("DELETE FROM components
              WHERE program=" . SqlQuote($product) . "