From: justdave%bugzilla.org <>
Date: Wed, 15 Sep 2004 07:58:32 +0000 (+0000)
Subject: Bug 256004: Fix regression that caused duplicate sortkeys in the fielddefs table
X-Git-Tag: bugzilla-2.19.1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=234bfc8f01aa41accc5c6071b78993df6283eedd;p=thirdparty%2Fbugzilla.git

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 6b9b1042cf..9d2ca4241d 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -2138,11 +2138,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++;
 }