From: Simon Green <sgreen+mozilla@redhat.com>
Date: Fri, 12 Oct 2012 20:04:17 +0000 (+0200)
Subject: Bug 790129: Bugzilla->fields returns fields in random order (the sortkey is ignored)
X-Git-Tag: bugzilla-4.2.4~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af1cf8f17877c1705c8cac98e26c6838340379d6;p=thirdparty%2Fbugzilla.git

Bug 790129: Bugzilla->fields returns fields in random order (the sortkey is ignored)
r/a=LpSolit
---

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 65ddcc2bce..5b39e4c810 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -592,7 +592,8 @@ sub fields {
         }
     }
 
-    return $do_by_name ? \%requested : [values %requested];
+    return $do_by_name ? \%requested
+        : [sort { $a->sortkey <=> $b->sortkey || $a->name cmp $b->name } values %requested];
 }
 
 sub active_custom_fields {
@@ -847,7 +848,7 @@ in a hashref:
 =item C<by_name>
 
 If false (or not specified), this method will return an arrayref of
-the requested fields. The order of the returned fields is random.
+the requested fields.
 
 If true, this method will return a hashref of fields, where the keys
 are field names and the valules are L<Bugzilla::Field> objects.