Fix for bug 72862: fixes more Perl warnings in RelationSet.pm and globals.pl

diff --git a/Bugzilla/RelationSet.pm b/Bugzilla/RelationSet.pm
index bc31c96c7ae918b96ba3cc0f11a7ead532beeaaa..4b778a6fdbe426aa02d2c6a2aac7e86a52cf1b08 100644 (file)
--- 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 bc31c96c7ae918b96ba3cc0f11a7ead532beeaaa..4b778a6fdbe426aa02d2c6a2aac7e86a52cf1b08 100644 (file)
--- 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 4b68d717b641b7e311db580c0b8e9e4c3cdab058..81aa80e4ea6e0e4f16cb2377a40e9808456c9d29 100644 (file)
--- 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;
 }
 
 #