From 17a206d194eda7c06891325bf50a3a58a57cd22b Mon Sep 17 00:00:00 2001
From: "bbaetz%student.usyd.edu.au" <>
Date: Thu, 5 Sep 2002 05:43:32 +0000
Subject: Bug 165756 - Running tests without checksetup causes failure r=joel,
 jake

---
 Bug.pm             | 3 +--
 Bugzilla/Bug.pm    | 3 +--
 Bugzilla/Search.pm | 3 +--
 move.pl            | 6 +++++-
 xml.cgi            | 5 +++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Bug.pm b/Bug.pm
index 3cbb1e765..7e703d14f 100755
--- a/Bug.pm
+++ b/Bug.pm
@@ -26,8 +26,7 @@ use strict;
 use DBI;
 use RelationSet;
 use vars qw($unconfirmedstate $legal_keywords);
-require "globals.pl";
-require "CGI.pl";
+
 package Bug;
 use CGI::Carp qw(fatalsToBrowser);
 my %ok_field;
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 3cbb1e765..7e703d14f 100755
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -26,8 +26,7 @@ use strict;
 use DBI;
 use RelationSet;
 use vars qw($unconfirmedstate $legal_keywords);
-require "globals.pl";
-require "CGI.pl";
+
 package Bug;
 use CGI::Carp qw(fatalsToBrowser);
 my %ok_field;
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 46921da28..fc4ae6213 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -27,8 +27,7 @@
 
 use strict;
 
-require "globals.pl";
-require "CGI.pl";
+# The caller MUST require CGI.pl and globals.pl before using this
 
 use vars qw($userid $usergroupset);
 
diff --git a/move.pl b/move.pl
index fe86011fa..1fcf35707 100755
--- a/move.pl
+++ b/move.pl
@@ -25,8 +25,12 @@ use strict;
 
 use lib qw(.);
 
-use Bug;
 require "CGI.pl";
+
+use vars qw($userid %COOKIE);
+
+use Bug;
+
 $::lockcount = 0;
 
 unless ( Param("move-enabled") ) {
diff --git a/xml.cgi b/xml.cgi
index 16442db0d..91f8e8c03 100755
--- a/xml.cgi
+++ b/xml.cgi
@@ -26,10 +26,11 @@ use strict;
 
 use lib qw(.);
 
-use Bug;
 require "CGI.pl";
 
-use vars qw($template $vars);
+use Bug;
+
+use vars qw($template $vars $userid %COOKIE);
 
 ConnectToDatabase();
 quietly_check_login();
-- 
cgit v1.2.3-24-g4f1b