Bug 343248: SQL query to get all keywords with bug count is duplicated in editkeywords.cgi and describekeywords.cgi

Patch By Remi Zara <remi_zara@mac.com> r=mkanat, a=justdave

1 files changed, 2 insertions, 11 deletions

diff --git a/editkeywords.cgi b/editkeywords.cgi
index 9696480bd..7b906c30b 100755
--- a/editkeywords.cgi
+++ b/editkeywords.cgi
@@ -27,6 +27,7 @@ use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::Util;
 use Bugzilla::Error;
+use Bugzilla::Keyword;
 
 my $cgi = Bugzilla->cgi;
 my $dbh = Bugzilla->dbh;
@@ -79,17 +80,7 @@ $vars->{'action'} = $action;
 
 
 if ($action eq "") {
-    my @keywords;
-
-    $vars->{'keywords'} =
-      $dbh->selectall_arrayref('SELECT keyworddefs.id, keyworddefs.name,
-                                       keyworddefs.description,
-                                       COUNT(keywords.bug_id) AS bug_count
-                                  FROM keyworddefs
-                             LEFT JOIN keywords
-                                    ON keyworddefs.id = keywords.keywordid ' .
-                                  $dbh->sql_group_by('id', 'name, description') . '
-                                 ORDER BY keyworddefs.name', {'Slice' => {}});
+    $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
 
     print $cgi->header();
     $template->process("admin/keywords/list.html.tmpl", $vars)