From 02b73228dd425f06e6108c8791ff8f00fce8c2d0 Mon Sep 17 00:00:00 2001
From: "bbaetz%student.usyd.edu.au"
 <bbaetz%student.usyd.edu.au@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 4 Sep 2002 22:43:38 +0000
Subject: [PATCH] Bug 165756 - Running tests without checksetup causes failure
 r=joel, jake

git-svn-id: svn://10.0.0.236/trunk@128846 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/Bug.pm             | 3 +--
 mozilla/webtools/bugzilla/Bugzilla/Bug.pm    | 3 +--
 mozilla/webtools/bugzilla/Bugzilla/Search.pm | 3 +--
 mozilla/webtools/bugzilla/move.pl            | 6 +++++-
 mozilla/webtools/bugzilla/xml.cgi            | 5 +++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/mozilla/webtools/bugzilla/Bug.pm b/mozilla/webtools/bugzilla/Bug.pm
index 3cbb1e765b6..7e703d14f8f 100755
--- a/mozilla/webtools/bugzilla/Bug.pm
+++ b/mozilla/webtools/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/mozilla/webtools/bugzilla/Bugzilla/Bug.pm b/mozilla/webtools/bugzilla/Bugzilla/Bug.pm
index 3cbb1e765b6..7e703d14f8f 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Bug.pm
+++ b/mozilla/webtools/bugzilla/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/mozilla/webtools/bugzilla/Bugzilla/Search.pm b/mozilla/webtools/bugzilla/Bugzilla/Search.pm
index 46921da28e7..fc4ae6213bc 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Search.pm
+++ b/mozilla/webtools/bugzilla/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/mozilla/webtools/bugzilla/move.pl b/mozilla/webtools/bugzilla/move.pl
index fe86011fa48..1fcf3570712 100755
--- a/mozilla/webtools/bugzilla/move.pl
+++ b/mozilla/webtools/bugzilla/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/mozilla/webtools/bugzilla/xml.cgi b/mozilla/webtools/bugzilla/xml.cgi
index 16442db0d24..91f8e8c0315 100755
--- a/mozilla/webtools/bugzilla/xml.cgi
+++ b/mozilla/webtools/bugzilla/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();