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

webtools/bugzilla/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;

webtools/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;

webtools/bugzilla/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;
 }
 
 #