summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkanat%bugzilla.org <>2006-07-04 06:42:45 +0200
committermkanat%bugzilla.org <>2006-07-04 06:42:45 +0200
commitd15c41c6916aa127a3099a09f592b05d418189b1 (patch)
treec7c4df5cf9fb253f720f275527711ae24503595c
parentb1f4cf8bdc4b49c02ebebbee2553202bc46ab720 (diff)
downloadbugzilla-d15c41c6916aa127a3099a09f592b05d418189b1.tar.gz
bugzilla-d15c41c6916aa127a3099a09f592b05d418189b1.tar.xz
Bug 338375: Use Bugzilla->params everywhere instead of Param().
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=justdave
-rw-r--r--Bugzilla/Attachment.pm1
-rw-r--r--Bugzilla/Auth.pm1
-rw-r--r--Bugzilla/Auth/Login/CGI.pm1
-rw-r--r--Bugzilla/Auth/Login/Env.pm1
-rw-r--r--Bugzilla/Auth/Persist/Cookie.pm1
-rw-r--r--Bugzilla/Auth/Verify/LDAP.pm1
-rwxr-xr-xBugzilla/Bug.pm1
-rw-r--r--Bugzilla/BugMail.pm1
-rw-r--r--Bugzilla/Config.pm35
-rw-r--r--Bugzilla/DB.pm2
-rw-r--r--Bugzilla/Flag.pm1
-rw-r--r--Bugzilla/FlagType.pm1
-rw-r--r--Bugzilla/Mailer.pm1
-rw-r--r--Bugzilla/Search.pm1
-rw-r--r--Bugzilla/Search/Quicksearch.pm1
-rw-r--r--Bugzilla/Template.pm3
-rw-r--r--Bugzilla/Template/Plugin/Hook.pm1
-rw-r--r--Bugzilla/Token.pm1
-rw-r--r--Bugzilla/User.pm1
-rwxr-xr-xattachment.cgi2
-rwxr-xr-xbuglist.cgi1
-rwxr-xr-xchart.cgi1
-rwxr-xr-xchecksetup.pl2
-rwxr-xr-xcolchange.cgi1
-rwxr-xr-xcollectstats.pl1
-rwxr-xr-xconfig.cgi1
-rwxr-xr-xcontrib/bug_email.pl3
-rwxr-xr-xcontrib/bugzilla_email_append.pl1
-rw-r--r--contrib/merge-users.pl1
-rw-r--r--contrib/sendbugmail.pl3
-rwxr-xr-xcontrib/syncLDAP.pl1
-rwxr-xr-xcreateaccount.cgi1
-rwxr-xr-xduplicates.cgi1
-rwxr-xr-xeditclassifications.cgi1
-rwxr-xr-xeditcomponents.cgi1
-rwxr-xr-xeditgroups.cgi2
-rwxr-xr-xeditparams.cgi2
-rwxr-xr-xeditproducts.cgi1
-rwxr-xr-xeditusers.cgi1
-rwxr-xr-xeditvalues.cgi2
-rwxr-xr-xeditwhines.cgi1
-rwxr-xr-xenter_bug.cgi1
-rwxr-xr-ximportxml.pl1
-rwxr-xr-xindex.cgi1
-rwxr-xr-xpost_bug.cgi1
-rwxr-xr-xprocess_bug.cgi1
-rwxr-xr-xquery.cgi1
-rwxr-xr-xquips.cgi1
-rwxr-xr-xreports.cgi1
-rwxr-xr-xrequest.cgi1
-rwxr-xr-xshow_bug.cgi1
-rwxr-xr-xshowdependencygraph.cgi1
-rwxr-xr-xsummarize_time.cgi1
-rwxr-xr-xuserprefs.cgi1
-rwxr-xr-xvotes.cgi1
-rwxr-xr-xwhine.pl1
-rwxr-xr-xwhineatnews.pl1
57 files changed, 9 insertions, 94 deletions
diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index 0ed77974f..f012c3f2e 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -50,7 +50,6 @@ that users upload to the Bugzilla server.
use Bugzilla::Constants;
use Bugzilla::Error;
use Bugzilla::Flag;
-use Bugzilla::Config;
use Bugzilla::User;
use Bugzilla::Util qw(trick_taint);
diff --git a/Bugzilla/Auth.pm b/Bugzilla/Auth.pm
index b6d378a43..40a0917ef 100644
--- a/Bugzilla/Auth.pm
+++ b/Bugzilla/Auth.pm
@@ -32,7 +32,6 @@ use fields qw(
use Bugzilla::Constants;
use Bugzilla::Error;
-use Bugzilla::Config;
use Bugzilla::Auth::Login::Stack;
use Bugzilla::Auth::Verify::Stack;
use Bugzilla::Auth::Persist::Cookie;
diff --git a/Bugzilla/Auth/Login/CGI.pm b/Bugzilla/Auth/Login/CGI.pm
index d0c29d8aa..033cb992b 100644
--- a/Bugzilla/Auth/Login/CGI.pm
+++ b/Bugzilla/Auth/Login/CGI.pm
@@ -33,7 +33,6 @@ use strict;
use base qw(Bugzilla::Auth::Login);
use constant user_can_create_account => 1;
-use Bugzilla::Config;
use Bugzilla::Constants;
use Bugzilla::Util;
use Bugzilla::Error;
diff --git a/Bugzilla/Auth/Login/Env.pm b/Bugzilla/Auth/Login/Env.pm
index f9837b3e6..180e79ba7 100644
--- a/Bugzilla/Auth/Login/Env.pm
+++ b/Bugzilla/Auth/Login/Env.pm
@@ -24,7 +24,6 @@ package Bugzilla::Auth::Login::Env;
use strict;
use base qw(Bugzilla::Auth::Login);
-use Bugzilla::Config;
use Bugzilla::Constants;
use Bugzilla::Error;
diff --git a/Bugzilla/Auth/Persist/Cookie.pm b/Bugzilla/Auth/Persist/Cookie.pm
index 3d8599c18..3faa892ae 100644
--- a/Bugzilla/Auth/Persist/Cookie.pm
+++ b/Bugzilla/Auth/Persist/Cookie.pm
@@ -32,7 +32,6 @@ package Bugzilla::Auth::Persist::Cookie;
use strict;
use fields qw();
-use Bugzilla::Config;
use Bugzilla::Constants;
use Bugzilla::Util;
use Bugzilla::Token;
diff --git a/Bugzilla/Auth/Verify/LDAP.pm b/Bugzilla/Auth/Verify/LDAP.pm
index 713619589..9f050d854 100644
--- a/Bugzilla/Auth/Verify/LDAP.pm
+++ b/Bugzilla/Auth/Verify/LDAP.pm
@@ -35,7 +35,6 @@ use fields qw(
ldap
);
-use Bugzilla::Config;
use Bugzilla::Constants;
use Bugzilla::Error;
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 72ca27093..64da19af4 100755
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -33,7 +33,6 @@ use strict;
use CGI::Carp qw(fatalsToBrowser);
use Bugzilla::Attachment;
-use Bugzilla::Config;
use Bugzilla::Constants;
use Bugzilla::Field;
use Bugzilla::Flag;
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index dc6efc735..ddcf4791e 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -35,7 +35,6 @@ package Bugzilla::BugMail;
use Bugzilla::Error;
use Bugzilla::User;
use Bugzilla::Constants;
-use Bugzilla::Config;
use Bugzilla::Util;
use Bugzilla::Bug;
use Bugzilla::Product;
diff --git a/Bugzilla/Config.pm b/Bugzilla/Config.pm
index c4a23f9cb..57c60dbb0 100644
--- a/Bugzilla/Config.pm
+++ b/Bugzilla/Config.pm
@@ -35,9 +35,6 @@ use strict;
use base qw(Exporter);
use Bugzilla::Constants;
-# Module stuff
-@Bugzilla::Config::EXPORT = qw(Param);
-
# Don't export localvars by default - people should have to explicitly
# ask for it, as a (probably futile) attempt to stop code using it
# when it shouldn't
@@ -92,28 +89,6 @@ sub param_panels {
return @param_panels;
}
-sub Param {
- my ($param) = @_;
-
- _load_params unless %params;
- my %param_values = %{Bugzilla->params};
-
- # By this stage, the param must be in the hash
- die "Can't find param named $param" unless (exists $params{$param});
-
- # When module startup code runs (which is does even via -c, when using
- # |use|), we may try to grab params which don't exist yet. This affects
- # tests, so have this as a fallback for the -c case
- return $params{$param}->{default}
- if ($^C && not exists $param_values{$param});
-
- # If we have a value for the param, return it
- return $param_values{$param} if exists $param_values{$param};
-
- # Else error out
- die "No value for param $param (try running checksetup.pl again)";
-}
-
sub SetParam {
my ($name, $value) = @_;
@@ -277,11 +252,6 @@ Bugzilla::Config - Configuration parameters for Bugzilla
=head1 SYNOPSIS
- # Getting parameters
- use Bugzilla::Config;
-
- my $fooSetting = Bugzilla->params->{'foo'};
-
# Administration functions
use Bugzilla::Config qw(:admin);
@@ -305,11 +275,6 @@ Parameters can be set, retrieved, and updated.
=over 4
-=item C<Bugzilla->params->{$name}>
-
-Returns the Param with the specified name. Either a string, or, in the case
-of multiple-choice parameters, an array reference.
-
=item C<SetParam($name, $value)>
Sets the param named $name to $value. Values are checked using the checker
diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index 3d30dd778..044aa3dea 100644
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -35,7 +35,7 @@ use DBI;
# Inherit the DB class from DBI::db.
use base qw(DBI::db);
-use Bugzilla::Config qw(:DEFAULT :db);
+use Bugzilla::Config qw(:db);
use Bugzilla::Constants;
use Bugzilla::Util;
use Bugzilla::Error;
diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index 8646e72ac..50721f159 100644
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -61,7 +61,6 @@ package Bugzilla::Flag;
use Bugzilla::FlagType;
use Bugzilla::User;
-use Bugzilla::Config;
use Bugzilla::Util;
use Bugzilla::Error;
use Bugzilla::Mailer;
diff --git a/Bugzilla/FlagType.pm b/Bugzilla/FlagType.pm
index 078f6de71..ce4f31e68 100644
--- a/Bugzilla/FlagType.pm
+++ b/Bugzilla/FlagType.pm
@@ -59,7 +59,6 @@ use Bugzilla::User;
use Bugzilla::Error;
use Bugzilla::Util;
-use Bugzilla::Config;
######################################################################
# Global Variables
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index 9f51c71e0..15df6bddd 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -37,7 +37,6 @@ use base qw(Exporter);
@Bugzilla::Mailer::EXPORT = qw(MessageToMTA);
use Bugzilla::Constants;
-use Bugzilla::Config;
use Bugzilla::Util;
use Mail::Header;
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index f9bf55388..e8da89204 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -34,7 +34,6 @@ package Bugzilla::Search;
use base qw(Exporter);
@Bugzilla::Search::EXPORT = qw(IsValidQueryType);
-use Bugzilla::Config;
use Bugzilla::Error;
use Bugzilla::Util;
use Bugzilla::Constants;
diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index 48b825318..eba9bac01 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -23,7 +23,6 @@ package Bugzilla::Search::Quicksearch;
# Make it harder for us to do dangerous things in Perl.
use strict;
-use Bugzilla::Config;
use Bugzilla::Error;
use Bugzilla::Constants;
use Bugzilla::Keyword;
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 65d937510..6094d6499 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -35,7 +35,6 @@ package Bugzilla::Template;
use strict;
use Bugzilla::Constants;
-use Bugzilla::Config;
use Bugzilla::Util;
use Bugzilla::User;
use Bugzilla::Error;
@@ -771,7 +770,7 @@ sub create {
# Default variables for all templates
VARIABLES => {
# Function for retrieving global parameters.
- 'Param' => \&Bugzilla::Config::Param,
+ 'Param' => sub { return Bugzilla->params->{$_[0]}; },
# Function to create date strings
'time2str' => \&Date::Format::time2str,
diff --git a/Bugzilla/Template/Plugin/Hook.pm b/Bugzilla/Template/Plugin/Hook.pm
index 6f744a8aa..a5eec820b 100644
--- a/Bugzilla/Template/Plugin/Hook.pm
+++ b/Bugzilla/Template/Plugin/Hook.pm
@@ -25,7 +25,6 @@ package Bugzilla::Template::Plugin::Hook;
use strict;
-use Bugzilla::Config;
use Bugzilla::Constants;
use Bugzilla::Template;
use Bugzilla::Util;
diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index c2e11f5a3..c570c34b1 100644
--- a/Bugzilla/Token.pm
+++ b/Bugzilla/Token.pm
@@ -29,7 +29,6 @@ use strict;
# Bundle the functions in this file together into the "Bugzilla::Token" package.
package Bugzilla::Token;
-use Bugzilla::Config;
use Bugzilla::Error;
use Bugzilla::Mailer;
use Bugzilla::Util;
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 1c30ce024..9977ca86c 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -40,7 +40,6 @@ use strict;
# This module implements utilities for dealing with Bugzilla users.
package Bugzilla::User;
-use Bugzilla::Config;
use Bugzilla::Error;
use Bugzilla::Util;
use Bugzilla::Constants;
diff --git a/attachment.cgi b/attachment.cgi
index 3ed2984c4..fcbd10020 100755
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -38,7 +38,7 @@ use strict;
use lib qw(.);
use Bugzilla;
-use Bugzilla::Config qw(:DEFAULT :localconfig);
+use Bugzilla::Config qw(:localconfig);
use Bugzilla::Constants;
use Bugzilla::Error;
use Bugzilla::Flag;
diff --git a/buglist.cgi b/buglist.cgi
index 0fcf13b88..937749d28 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -38,7 +38,6 @@ use Bugzilla;
use Bugzilla::Constants;
use Bugzilla::Error;
use Bugzilla::Util;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Search;
use Bugzilla::Search::Quicksearch;
use Bugzilla::User;
diff --git a/chart.cgi b/chart.cgi
index b40a8113e..fd7025855 100755
--- a/chart.cgi
+++ b/chart.cgi
@@ -47,7 +47,6 @@ use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Error;
use Bugzilla::Util;
use Bugzilla::Chart;
diff --git a/checksetup.pl b/checksetup.pl
index ba4efd0e4..fae291569 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -517,7 +517,7 @@ BEGIN {
$::ENV{'PATH'} = $env;
require Bugzilla::Config;
- import Bugzilla::Config qw(:DEFAULT :admin);
+ import Bugzilla::Config qw(:admin);
}
# 12/17/00 justdave@syndicomm.com - removed declarations of the localconfig
diff --git a/colchange.cgi b/colchange.cgi
index 6d737d5c7..3f06ca533 100755
--- a/colchange.cgi
+++ b/colchange.cgi
@@ -27,7 +27,6 @@ use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Error;
use Bugzilla::User;
use Bugzilla::Keyword;
diff --git a/collectstats.pl b/collectstats.pl
index 2f76e544f..0739d0312 100755
--- a/collectstats.pl
+++ b/collectstats.pl
@@ -37,7 +37,6 @@ use lib ".";
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Util;
use Bugzilla::Search;
use Bugzilla::User;
diff --git a/config.cgi b/config.cgi
index 3675a342f..2ebcea181 100755
--- a/config.cgi
+++ b/config.cgi
@@ -32,7 +32,6 @@ use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Error;
use Bugzilla::Keyword;
use Bugzilla::Bug;
diff --git a/contrib/bug_email.pl b/contrib/bug_email.pl
index 3cb796b7e..d2fc91b66 100755
--- a/contrib/bug_email.pl
+++ b/contrib/bug_email.pl
@@ -38,7 +38,7 @@
#
# You need to work with bug_email.pl the MIME::Parser installed.
#
-# $Id: bug_email.pl,v 1.43 2006/07/03 21:26:22 mkanat%bugzilla.org Exp $
+# $Id: bug_email.pl,v 1.44 2006/07/03 21:42:47 mkanat%bugzilla.org Exp $
###############################################################
# 02/12/2000 (SML)
@@ -91,7 +91,6 @@ use lib "../";
use Bugzilla;
use BugzillaEmail;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Constants;
use Bugzilla::Util;
use Bugzilla::BugMail;
diff --git a/contrib/bugzilla_email_append.pl b/contrib/bugzilla_email_append.pl
index fef46f01b..4b2e53f20 100755
--- a/contrib/bugzilla_email_append.pl
+++ b/contrib/bugzilla_email_append.pl
@@ -40,7 +40,6 @@ BEGIN {
use Bugzilla;
use Bugzilla::Constants;
use BugzillaEmail;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::BugMail;
my $dbh = Bugzilla->dbh;
diff --git a/contrib/merge-users.pl b/contrib/merge-users.pl
index 540b22fb9..2458755e6 100644
--- a/contrib/merge-users.pl
+++ b/contrib/merge-users.pl
@@ -48,7 +48,6 @@ use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Util;
use Getopt::Long;
diff --git a/contrib/sendbugmail.pl b/contrib/sendbugmail.pl
index 8537f66ce..ae282ca4a 100644
--- a/contrib/sendbugmail.pl
+++ b/contrib/sendbugmail.pl
@@ -4,7 +4,7 @@
#
# Nick Barnes, Ravenbrook Limited, 2004-04-01.
#
-# $Id: sendbugmail.pl,v 1.6 2006/07/03 21:26:22 mkanat%bugzilla.org Exp $
+# $Id: sendbugmail.pl,v 1.7 2006/07/03 21:42:47 mkanat%bugzilla.org Exp $
#
# Bugzilla email script for Bugzilla 2.17.4 and later. Invoke this to send
# bugmail for a bug which has been changed directly in the database.
@@ -17,7 +17,6 @@
use lib qw(.);
use Bugzilla;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Util;
use Bugzilla::BugMail;
use Bugzilla::User;
diff --git a/contrib/syncLDAP.pl b/contrib/syncLDAP.pl
index 4ddabacea..32d01f150 100755
--- a/contrib/syncLDAP.pl
+++ b/contrib/syncLDAP.pl
@@ -26,7 +26,6 @@ use lib qw(.);
use Net::LDAP;
use Bugzilla;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::User;
my $cgi = Bugzilla->cgi;
diff --git a/createaccount.cgi b/createaccount.cgi
index a0f1ed2c3..ab011f336 100755
--- a/createaccount.cgi
+++ b/createaccount.cgi
@@ -30,7 +30,6 @@ use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Error;
use Bugzilla::User;
use Bugzilla::BugMail;
diff --git a/duplicates.cgi b/duplicates.cgi
index 1de3fe15c..7934c5c8f 100755
--- a/duplicates.cgi
+++ b/duplicates.cgi
@@ -31,7 +31,6 @@ use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Util;
use Bugzilla::Error;
use Bugzilla::Search;
diff --git a/editclassifications.cgi b/editclassifications.cgi
index 23ac30d37..70aa256fb 100755
--- a/editclassifications.cgi
+++ b/editclassifications.cgi
@@ -27,7 +27,6 @@ use Bugzilla;
use Bugzilla::Constants;
use Bugzilla::Util;
use Bugzilla::Error;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Classification;
my $cgi = Bugzilla->cgi;
diff --git a/editcomponents.cgi b/editcomponents.cgi
index 244e83e55..e66e95195 100755
--- a/editcomponents.cgi
+++ b/editcomponents.cgi
@@ -31,7 +31,6 @@ use lib ".";
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Series;
use Bugzilla::Util;
use Bugzilla::Error;
diff --git a/editgroups.cgi b/editgroups.cgi
index f511a68a6..39e78e9e6 100755
--- a/editgroups.cgi
+++ b/editgroups.cgi
@@ -29,7 +29,7 @@ use lib ".";
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT :admin);
+use Bugzilla::Config qw(:admin);
use Bugzilla::Util;
use Bugzilla::Error;
use Bugzilla::Group;
diff --git a/editparams.cgi b/editparams.cgi
index 27db4654f..5ae2bcc25 100755
--- a/editparams.cgi
+++ b/editparams.cgi
@@ -27,7 +27,7 @@ use lib ".";
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT :admin);
+use Bugzilla::Config qw(:admin);
use Bugzilla::Config::Common;
use Bugzilla::Util;
use Bugzilla::Error;
diff --git a/editproducts.cgi b/editproducts.cgi
index 8a0dd5fe8..2d2f81009 100755
--- a/editproducts.cgi
+++ b/editproducts.cgi
@@ -36,7 +36,6 @@ use lib ".";
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Util;
use Bugzilla::Error;
use Bugzilla::Bug;
diff --git a/editusers.cgi b/editusers.cgi
index 42a7d6e3a..86e2cf424 100755
--- a/editusers.cgi
+++ b/editusers.cgi
@@ -25,7 +25,6 @@ use lib ".";
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Util;
use Bugzilla::Error;
use Bugzilla::User;
diff --git a/editvalues.cgi b/editvalues.cgi
index c812c6c87..013e82be7 100755
--- a/editvalues.cgi
+++ b/editvalues.cgi
@@ -25,7 +25,7 @@ use Bugzilla;
use Bugzilla::Util;
use Bugzilla::Error;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT :admin);
+use Bugzilla::Config qw(:admin);
# List of different tables that contain the changeable field values
# (the old "enums.") Keep them in alphabetical order by their
diff --git a/editwhines.cgi b/editwhines.cgi
index 282b66ddb..f0fddeb5b 100755
--- a/editwhines.cgi
+++ b/editwhines.cgi
@@ -31,7 +31,6 @@ use lib ".";
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Util;
use Bugzilla::Error;
use Bugzilla::User;
diff --git a/enter_bug.cgi b/enter_bug.cgi
index 929e690c8..e5463b501 100755
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@@ -39,7 +39,6 @@ use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Util;
use Bugzilla::Error;
use Bugzilla::Bug;
diff --git a/importxml.pl b/importxml.pl
index 263508b37..6ed2727ea 100755
--- a/importxml.pl
+++ b/importxml.pl
@@ -79,7 +79,6 @@ use Bugzilla::Version;
use Bugzilla::Component;
use Bugzilla::Milestone;
use Bugzilla::FlagType;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::BugMail;
use Bugzilla::Mailer;
use Bugzilla::User;
diff --git a/index.cgi b/index.cgi
index 3a591a32c..9c3b6be96 100755
--- a/index.cgi
+++ b/index.cgi
@@ -33,7 +33,6 @@ use lib ".";
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Error;
use Bugzilla::Update;
diff --git a/post_bug.cgi b/post_bug.cgi
index 702ff96a4..6dcc776a4 100755
--- a/post_bug.cgi
+++ b/post_bug.cgi
@@ -30,7 +30,6 @@ use lib qw(.);
use Bugzilla;
use Bugzilla::Attachment;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Util;
use Bugzilla::Error;
use Bugzilla::Bug;
diff --git a/process_bug.cgi b/process_bug.cgi
index ec2e8f5fd..fa34ae709 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -45,7 +45,6 @@ use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Bug;
use Bugzilla::Mailer;
use Bugzilla::User;
diff --git a/query.cgi b/query.cgi
index 382fa37c4..9c2067d3e 100755
--- a/query.cgi
+++ b/query.cgi
@@ -31,7 +31,6 @@ use lib ".";
use Bugzilla;
use Bugzilla::Bug;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Search;
use Bugzilla::User;
use Bugzilla::Util;
diff --git a/quips.cgi b/quips.cgi
index c405e089c..06b6b0dd8 100755
--- a/quips.cgi
+++ b/quips.cgi
@@ -29,7 +29,6 @@ use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Util;
use Bugzilla::Error;
use Bugzilla::User;
diff --git a/reports.cgi b/reports.cgi
index 09b8dc30e..6c7a4ea39 100755
--- a/reports.cgi
+++ b/reports.cgi
@@ -39,7 +39,6 @@ use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Util;
use Bugzilla::Error;
diff --git a/request.cgi b/request.cgi
index 9383c2108..3057eebd6 100755
--- a/request.cgi
+++ b/request.cgi
@@ -31,7 +31,6 @@ use strict;
use lib qw(.);
use Bugzilla;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Util;
use Bugzilla::Error;
use Bugzilla::Flag;
diff --git a/show_bug.cgi b/show_bug.cgi
index 9e322a75f..a23621d78 100755
--- a/show_bug.cgi
+++ b/show_bug.cgi
@@ -26,7 +26,6 @@ use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Error;
use Bugzilla::User;
use Bugzilla::Keyword;
diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi
index 5b6c3195a..c797e2b12 100755
--- a/showdependencygraph.cgi
+++ b/showdependencygraph.cgi
@@ -29,7 +29,6 @@ use File::Temp;
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Util;
use Bugzilla::Error;
use Bugzilla::Bug;
diff --git a/summarize_time.cgi b/summarize_time.cgi
index 371e43f81..7693c988a 100755
--- a/summarize_time.cgi
+++ b/summarize_time.cgi
@@ -25,7 +25,6 @@ use Date::Format; # strftime
use Bugzilla;
use Bugzilla::Constants; # LOGIN_*
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Bug; # EmitDependList
use Bugzilla::Util; # trim
use Bugzilla::Error;
diff --git a/userprefs.cgi b/userprefs.cgi
index a07cff135..5c1a85e32 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -28,7 +28,6 @@ use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Search;
use Bugzilla::Util;
use Bugzilla::Error;
diff --git a/votes.cgi b/votes.cgi
index bbae0b7cb..7e72bfcd3 100755
--- a/votes.cgi
+++ b/votes.cgi
@@ -29,7 +29,6 @@ use lib ".";
use Bugzilla;
use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Util;
use Bugzilla::Error;
use Bugzilla::Bug;
diff --git a/whine.pl b/whine.pl
index 093b6e5e6..8e60370a3 100755
--- a/whine.pl
+++ b/whine.pl
@@ -29,7 +29,6 @@ use strict;
use lib ".";
use Bugzilla;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Constants;
use Bugzilla::Search;
use Bugzilla::User;
diff --git a/whineatnews.pl b/whineatnews.pl
index 3276858e7..580990769 100755
--- a/whineatnews.pl
+++ b/whineatnews.pl
@@ -31,7 +31,6 @@ use strict;
use lib '.';
use Bugzilla;
-use Bugzilla::Config qw(:DEFAULT);
use Bugzilla::Mailer;
use Bugzilla::Util;