2 files changed, 14 insertions, 4 deletions

diff --git a/checksetup.pl b/checksetup.pl
index a0a7835ba..b4f9fb930 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -3838,8 +3838,14 @@ add_setting ("display_quips", {"on" => 1, "off" => 2 }, "on" );
 if (!$dbh->bz_get_field_def('bugs', 'qa_contact')->[2]) { # if it's NOT NULL
     $dbh->bz_change_field_type('bugs', 'qa_contact', 'mediumint');
     $dbh->do("UPDATE bugs SET qa_contact = NULL WHERE qa_contact = 0");
-    $dbh->do("UPDATE components SET initialqacontact = NULL
-               WHERE initialqacontact = 0");
+}
+
+# 2005-03-27 initialqacontact should be NULL instead of 0, bug 287483
+if (!$dbh->bz_get_field_def('components',
+                            'initialqacontact')->[2]) { # if it's NOT NULL
+    $dbh->bz_change_field_type('components', 'initialqacontact', 'mediumint');
+    $dbh->do("UPDATE components SET initialqacontact = NULL " .
+             "WHERE initialqacontact = 0");
 }
 
 # 2005-03-29 - gerv@gerv.net - bug 73665.
diff --git a/editcomponents.cgi b/editcomponents.cgi
index 9a1e7934e..a86329d9d 100755
--- a/editcomponents.cgi
+++ b/editcomponents.cgi
@@ -305,6 +305,8 @@ if ($action eq 'new') {
                            {'name' => $component});
         }
     }
+    my $initialqacontactsql =
+              $initialqacontact ne '' ? SqlQuote($initialqacontactid) : 'NULL';
 
     # Add the new component
     SendSQL("INSERT INTO components ( " .
@@ -314,7 +316,7 @@ if ($action eq 'new') {
           SqlQuote($component) . "," .
           SqlQuote($description) . "," .
           SqlQuote($initialownerid) . "," .
-          SqlQuote($initialqacontactid) . ")");
+          $initialqacontactsql . ")");
 
     # Insert default charting queries for this product.
     # If they aren't using charting, this won't do any harm.
@@ -611,9 +613,11 @@ if ($action eq 'update') {
             ThrowUserError('component_need_valid_initialqacontact',
                            {'name' => $componentold});
         }
+        my $initialqacontactsql =
+              $initialqacontact ne '' ? SqlQuote($initialqacontactid) : 'NULL';
 
         SendSQL("UPDATE components
-                 SET initialqacontact=" . SqlQuote($initialqacontactid) . "
+                 SET initialqacontact = $initialqacontactsql
                  WHERE id = $component_id");
 
         $vars->{'updated_initialqacontact'} = 1;