diff options
author | Simon Green <sgreen@redhat.com> | 2014-07-15 20:18:47 +1000 |
---|---|---|
committer | Simon Green <sgreen@redhat.com> | 2014-07-15 20:18:47 +1000 |
commit | 28bcce5b2a1e4344bac8b3d16756db5b89d67966 (patch) | |
tree | c92c78b890ba2040099923a21761eeef9af42695 /Bugzilla/DB/Mysql.pm | |
parent | 551eb6d2f6ed6da115b3ab51a966628ac445e29f (diff) | |
download | bugs-28bcce5b2a1e4344bac8b3d16756db5b89d67966.tar bugs-28bcce5b2a1e4344bac8b3d16756db5b89d67966.tar.gz bugs-28bcce5b2a1e4344bac8b3d16756db5b89d67966.tar.bz2 bugs-28bcce5b2a1e4344bac8b3d16756db5b89d67966.tar.xz bugs-28bcce5b2a1e4344bac8b3d16756db5b89d67966.zip |
Bug 936275 - In buglists, flags are sorted alphabetically instead of using their sortkey
r=dylan, a=glob
Diffstat (limited to 'Bugzilla/DB/Mysql.pm')
-rw-r--r-- | Bugzilla/DB/Mysql.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm index fcb3ef889..28df1f0e8 100644 --- a/Bugzilla/DB/Mysql.pm +++ b/Bugzilla/DB/Mysql.pm @@ -125,10 +125,13 @@ sub bz_last_key { } sub sql_group_concat { - my ($self, $column, $separator, $sort) = @_; + my ($self, $column, $separator, $sort, $order_by) = @_; $separator = $self->quote(', ') if !defined $separator; $sort = 1 if !defined $sort; - if ($sort) { + if ($order_by) { + $column .= " ORDER BY $order_by"; + } + elsif ($sort) { my $sort_order = $column; $sort_order =~ s/^DISTINCT\s+//i; $column = "$column ORDER BY $sort_order"; |