summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjustdave%syndicomm.com <>2001-06-01 11:14:23 +0200
committerjustdave%syndicomm.com <>2001-06-01 11:14:23 +0200
commitce7bf3fec2b2e1aaef1d538692d9dfe7bec93f17 (patch)
tree2507cde330522c12b54d3de574aaf23c3e749246
parentf30e92711a48569225bd1810b11c7ea91bae14d1 (diff)
downloadbugzilla-ce7bf3fec2b2e1aaef1d538692d9dfe7bec93f17.tar.gz
bugzilla-ce7bf3fec2b2e1aaef1d538692d9dfe7bec93f17.tar.xz
Fix for bug 72862: fixes more Perl warnings in RelationSet.pm and globals.pl
-rw-r--r--Bugzilla/RelationSet.pm8
-rw-r--r--RelationSet.pm8
-rw-r--r--globals.pl2
3 files changed, 16 insertions, 2 deletions
diff --git a/Bugzilla/RelationSet.pm b/Bugzilla/RelationSet.pm
index bc31c96c7..4b778a6fd 100644
--- a/Bugzilla/RelationSet.pm
+++ b/Bugzilla/RelationSet.pm
@@ -32,7 +32,11 @@
use diagnostics;
use strict;
-require "globals.pl";
+# Everything that uses RelationSet should already have globals.pl loaded
+# so we don't want to load it here. Doing so causes a loop in Perl because
+# globals.pl turns around and does a 'use RelationSet'
+# See http://bugzilla.mozilla.org/show_bug.cgi?id=72862
+#require "globals.pl";
package RelationSet;
use CGI::Carp qw(fatalsToBrowser);
@@ -260,3 +264,5 @@ sub toString {
return join(',', sort(@result));
}
+
+1;
diff --git a/RelationSet.pm b/RelationSet.pm
index bc31c96c7..4b778a6fd 100644
--- a/RelationSet.pm
+++ b/RelationSet.pm
@@ -32,7 +32,11 @@
use diagnostics;
use strict;
-require "globals.pl";
+# Everything that uses RelationSet should already have globals.pl loaded
+# so we don't want to load it here. Doing so causes a loop in Perl because
+# globals.pl turns around and does a 'use RelationSet'
+# See http://bugzilla.mozilla.org/show_bug.cgi?id=72862
+#require "globals.pl";
package RelationSet;
use CGI::Carp qw(fatalsToBrowser);
@@ -260,3 +264,5 @@ sub toString {
return join(',', sort(@result));
}
+
+1;
diff --git a/globals.pl b/globals.pl
index 4b68d717b..81aa80e4e 100644
--- a/globals.pl
+++ b/globals.pl
@@ -31,6 +31,7 @@ use strict;
sub globals_pl_sillyness {
my $zz;
+ $zz = @main::SqlStateStack;
$zz = @main::chooseone;
$zz = @main::default_column_list;
$zz = $main::defaultqueryname;
@@ -48,6 +49,7 @@ sub globals_pl_sillyness {
$zz = @main::legal_versions;
$zz = @main::milestoneurl;
$zz = @main::prodmaxvotes;
+ $zz = $main::superusergroupset;
}
#