Bug 256004: Fix regression that caused duplicate sortkeys in the fielddefs table

r=myk, a=justdave

diff --git a/checksetup.pl b/checksetup.pl
index a1a4ab11a3126ec19647c11acbf0ca5af08de313..06bc04a4f0c09a9bb1559b83998c7e6f99c2ebf0 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -2088,11 +2088,11 @@ sub AddFDef ($$$) {
         $dbh->do("INSERT INTO fielddefs " .
              "(fieldid, name, description, mailhead, sortkey) VALUES " .
              "($fieldid, $name, $description, $mailhead, $headernum)");
-        $headernum++;
     } else {
         $dbh->do("UPDATE fielddefs SET name = $name, description = $description, " .
-                 "mailhead = $mailhead WHERE fieldid = $fieldid");
+                 "mailhead = $mailhead, sortkey = $headernum WHERE fieldid = $fieldid");
     }
+    $headernum++;
 }