Bug 328642: Params should be in Bugzilla->params instead of being a Bugzilla::Config subroutine

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=justdave

1 files changed, 10 insertions, 1 deletions

diff --git a/checksetup.pl b/checksetup.pl
index 4a059f1c7..a2564f0a6 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -465,7 +465,16 @@ if ($^O =~ /MSWin/i) {
 # Global definitions
 ###########################################################################
 
-use Bugzilla::Config qw(:DEFAULT :admin :locations);
+# These don't work as a "use," and they don't work as a "require" outside
+# of a BEGIN block. However, we're safe to them in a BEGIN block here since 
+# we've already checked all of the pre-requisites above in the previous 
+# BEGIN block.
+BEGIN {
+    require Bugzilla;
+
+    require Bugzilla::Config;
+    import Bugzilla::Config qw(:DEFAULT :admin :locations);
+}
 
 # 12/17/00 justdave@syndicomm.com - removed declarations of the localconfig
 # variables from this location.  We don't want these declared here.  They'll