From 261bb90c5cf98eb824f6897cdc0c6c4191618115 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Mon, 12 Aug 2013 11:44:56 -0400
Subject: Bug 902212 - tidy up active_custom usage in TrackingFlags r=glob

---
 extensions/TrackingFlags/lib/Flag.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'extensions/TrackingFlags')

diff --git a/extensions/TrackingFlags/lib/Flag.pm b/extensions/TrackingFlags/lib/Flag.pm
index 2151c3763..5daa47508 100644
--- a/extensions/TrackingFlags/lib/Flag.pm
+++ b/extensions/TrackingFlags/lib/Flag.pm
@@ -190,7 +190,8 @@ sub get_all {
         my %tracking_flags_hash = map { $_->flag_id => $_ } @tracking_flags;
         $cache->{'tracking_flags'} = \%tracking_flags_hash;
     }
-    return values %{ $cache->{'tracking_flags'} };
+    return sort { $a->flag_type cmp $b->flag_type || $a->sortkey <=> $b->sortkey }
+           values %{ $cache->{'tracking_flags'} };
 }
 
 sub remove_from_db {
-- 
cgit v1.2.3-24-g4f1b