From e0543820c9b0d998ff5963d51eb12c3b98d3a445 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 7 Oct 2007 21:32:23 +0000
Subject: [PATCH] Bug 398883: [mod_perl] Three Variable "$cgi" will not stay
 shared errors in current CVS HEAD Patch By Max Kanat-Alexander
 <mkanat@bugzilla.org> r=LpSolit, a=LpSolit

git-svn-id: svn://10.0.0.236/trunk@237386 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/editgroups.cgi | 2 ++
 mozilla/webtools/bugzilla/query.cgi      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/mozilla/webtools/bugzilla/editgroups.cgi b/mozilla/webtools/bugzilla/editgroups.cgi
index b9503426b58..43875da5154 100755
--- a/mozilla/webtools/bugzilla/editgroups.cgi
+++ b/mozilla/webtools/bugzilla/editgroups.cgi
@@ -609,6 +609,7 @@ sub doGroupChanges {
 
 sub _do_add {
     my ($group, $changes, $sth_insert, $field, $type, $reverse) = @_;
+    my $cgi = Bugzilla->cgi;
 
     my $current;
     # $reverse means we're doing a granted_by--that is, somebody else
@@ -639,6 +640,7 @@ sub _do_add {
 
 sub _do_remove {
     my ($group, $changes, $sth_delete, $field, $type, $reverse) = @_;
+    my $cgi = Bugzilla->cgi;
     my $remove_items = Bugzilla::Group->new_from_list([$cgi->param($field)]);
 
     foreach my $remove (@$remove_items) {
diff --git a/mozilla/webtools/bugzilla/query.cgi b/mozilla/webtools/bugzilla/query.cgi
index c23c1b0fbe3..bd69330e948 100755
--- a/mozilla/webtools/bugzilla/query.cgi
+++ b/mozilla/webtools/bugzilla/query.cgi
@@ -111,6 +111,7 @@ local our %default;
 # and ignore any multiple values.
 sub PrefillForm {
     my ($buf) = (@_);
+    my $cgi = Bugzilla->cgi;
     $buf = new Bugzilla::CGI($buf);
     my $foundone = 0;