Bug 348923: Clean up a few more variable-scoping issues for mod_perl

process_bug.cgi

@@ -71,7 +71,7 @@ $vars->{'use_keywords'} = 1 if Bugzilla::Keyword::keyword_count();
 my @editable_bug_fields = editable_bug_fields();
 
 my $requiremilestone = 0;
-my $PrivilegesRequired = 0;
+local our $PrivilegesRequired = 0;
 
 ######################################################################
 # Subroutines
@@ -729,7 +729,7 @@ sub ChangeStatus {
 }
 
 sub ChangeResolution {
-    my ($str) = (@_);
+    my ($bug, $str) = (@_);
     my $dbh = Bugzilla->dbh;
     my $cgi = Bugzilla->cgi;
 
@@ -1053,7 +1053,7 @@ SWITCH: for ($cgi->param('knob')) {
         last SWITCH;
     };
     /^clearresolution$/ && CheckonComment( "clearresolution" ) && do {
-        ChangeResolution('');
+        ChangeResolution($bug, '');
         last SWITCH;
     };
     /^(resolve|change_resolution)$/ && CheckonComment( "resolve" ) && do {
@@ -1081,7 +1081,7 @@ SWITCH: for ($cgi->param('knob')) {
             ChangeStatus('RESOLVED');
         }
 
-        ChangeResolution($cgi->param('resolution'));
+        ChangeResolution($bug, $cgi->param('resolution'));
         last SWITCH;
     };
     /^reassign$/ && CheckonComment( "reassign" ) && do {
@@ -1125,7 +1125,7 @@ SWITCH: for ($cgi->param('knob')) {
     };
     /^reopen$/  && CheckonComment( "reopen" ) && do {
         ChangeStatus('REOPENED');
-        ChangeResolution('');
+        ChangeResolution($bug, '');
         last SWITCH;
     };
     /^verify$/ && CheckonComment( "verify" ) && do {
@@ -1184,7 +1184,7 @@ SWITCH: for ($cgi->param('knob')) {
         _remove_remaining_time();
 
         ChangeStatus('RESOLVED');
-        ChangeResolution('DUPLICATE');
+        ChangeResolution($bug, 'DUPLICATE');
         my $comment = $cgi->param('comment');
         $comment .= "\n\n" 
                     . get_text('bug_duplicate_of', { dupe_of => $duplicate });

showdependencytree.cgi

@@ -53,9 +53,9 @@ my $id = $cgi->param('id') || ThrowUserError('invalid_bug_id_or_alias');
 ValidateBugID($id);
 my $current_bug = new Bugzilla::Bug($id);
 
-my $hide_resolved = $cgi->param('hide_resolved') ? 1 : 0;
+local our $hide_resolved = $cgi->param('hide_resolved') ? 1 : 0;
 
-my $maxdepth = $cgi->param('maxdepth') || 0;
+local our $maxdepth = $cgi->param('maxdepth') || 0;
 if ($maxdepth !~ /^\d+$/) { $maxdepth = 0 };
 
 ################################################################################
@@ -63,7 +63,7 @@ if ($maxdepth !~ /^\d+$/) { $maxdepth = 0 };
 ################################################################################
 
 # Stores the greatest depth to which either tree goes.
-my $realdepth = 0;
+local our $realdepth = 0;
 
 # Generate the tree of bugs that this bug depends on and a list of IDs
 # appearing in the tree.