From: justdave%bugzilla.org <>
Date: Wed, 15 Sep 2004 07:59:18 +0000 (+0000)
Subject: Bug 256004: Fix regression that caused duplicate sortkeys in the fielddefs table
X-Git-Tag: bugzilla-2.18rc3~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7c72b5eefb991f8a98788bdc6882702c981c89a;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 a1a4ab11a3..06bc04a4f0 100755
--- 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++;
 }