From d6370f0638bfb1e237334e35e4e23524280cf6d2 Mon Sep 17 00:00:00 2001
From: "Sunil Joshi [:SunilJoshi]" <joshi_sunil@in.com>
Date: Fri, 21 Mar 2014 14:25:43 +0000
Subject: [PATCH] Bug 399087 - Remove the 'mostfreqthreshold' parameter
 r=dkl,a=justdave

---
 Bugzilla/Config/Query.pm                         | 7 -------
 Bugzilla/Constants.pm                            | 6 ++++++
 duplicates.cgi                                   | 5 ++---
 template/en/default/admin/params/query.html.tmpl | 5 -----
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/Bugzilla/Config/Query.pm b/Bugzilla/Config/Query.pm
index e1287386b..c7b33f620 100644
--- a/Bugzilla/Config/Query.pm
+++ b/Bugzilla/Config/Query.pm
@@ -25,13 +25,6 @@ sub get_param_list {
    checker => \&check_multi
   },
 
-  {
-   name => 'mostfreqthreshold',
-   type => 't',
-   default => '2',
-   checker => \&check_numeric
-  },
-
   {
    name => 'mybugstemplate',
    type => 't',
diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index a7f3f9e3b..984a61d45 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -187,6 +187,8 @@ use Memoize;
 
     AUDIT_CREATE
     AUDIT_REMOVE
+
+    MOST_FREQUENT_THRESHOLD
 );
 
 @Bugzilla::Constants::EXPORT_OK = qw(contenttypes);
@@ -616,6 +618,10 @@ use constant PRIVILEGES_REQUIRED_EMPOWERED => 3;
 use constant AUDIT_CREATE => '__create__';
 use constant AUDIT_REMOVE => '__remove__';
 
+# The minimum number of duplicates a bug needs to show up
+# on the "Most frequently reported bugs" page.
+use constant MOST_FREQUENT_THRESHOLD => 2;
+
 sub bz_locations {
     # Force memoize() to re-compute data per project, to avoid
     # sharing the same data across different installations.
diff --git a/duplicates.cgi b/duplicates.cgi
index d501b0e16..beac9c37e 100755
--- a/duplicates.cgi
+++ b/duplicates.cgi
@@ -172,10 +172,9 @@ my %since_dups = @{$dbh->selectcol_arrayref(
     $reso_field_id, $changedsince)};
 add_indirect_dups(\%since_dups, \%dupe_relation);
 
-# Enforce the mostfreqthreshold parameter and the "bug_id" cgi param.
-my $mostfreq = Bugzilla->params->{'mostfreqthreshold'};
+# Enforce the MOST_FREQUENT_THRESHOLD constant and the "bug_id" cgi param.
 foreach my $id (keys %total_dups) {
-    if ($total_dups{$id} < $mostfreq) {
+    if ($total_dups{$id} < MOST_FREQUENT_THRESHOLD) {
         delete $total_dups{$id};
         next;
     }
diff --git a/template/en/default/admin/params/query.html.tmpl b/template/en/default/admin/params/query.html.tmpl
index 85aaae500..d8a510282 100644
--- a/template/en/default/admin/params/query.html.tmpl
+++ b/template/en/default/admin/params/query.html.tmpl
@@ -26,11 +26,6 @@
                                 </li>
                               </ul>",
 
-  mostfreqthreshold => "The minimum number of duplicates $terms.abug needs to show up on the " _
-                       "<a href=\"duplicates.cgi\">most frequently reported $terms.bugs page</a>. " _
-                       "If you have a large database and this page takes a long time to " _
-                       "load, try increasing this number.",
-
   mybugstemplate => "This is the URL to use to bring up a simple 'all of my $terms.bugs' " _
                     "list for a user. %userid% will get replaced with the login name of a user. " _
                     "Special characters must be URL-encoded.",
-- 
2.24.1