From 0ca4c4c49583b2dc680ace8ac9b7c80ea62d7f37 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Fri, 8 Apr 2005 06:37:35 +0000
Subject: Bug 238878: Make hidden-fields template, User Matching and Flags use
 direct CGI instead of [% form.foo %] - Patch by Teemu Mannermaa
 <wicked@etlicon.fi> r=LpSolit a=justdave

---
 Bugzilla/FlagType.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'Bugzilla/FlagType.pm')

diff --git a/Bugzilla/FlagType.pm b/Bugzilla/FlagType.pm
index 084777b29..da0c43281 100644
--- a/Bugzilla/FlagType.pm
+++ b/Bugzilla/FlagType.pm
@@ -303,7 +303,7 @@ sub count {
 
 =over
 
-=item C<validate($data, $bug_id, $attach_id)>
+=item C<validate($cgi, $bug_id, $attach_id)>
 
 Get a list of flag types to validate.  Uses the "map" function
 to extract flag type IDs from form field names by matching columns
@@ -316,13 +316,13 @@ and returning just the ID portion of matching field names.
 
 sub validate {
     my $user = Bugzilla->user;
-    my ($data, $bug_id, $attach_id) = @_;
+    my ($cgi, $bug_id, $attach_id) = @_;
   
-    my @ids = map(/^flag_type-(\d+)$/ ? $1 : (), keys %$data);
+    my @ids = map(/^flag_type-(\d+)$/ ? $1 : (), $cgi->param());
   
     foreach my $id (@ids)
     {
-        my $status = $data->{"flag_type-$id"};
+        my $status = $cgi->param("flag_type-$id");
         
         # Don't bother validating types the user didn't touch.
         next if $status eq "X";
@@ -348,9 +348,9 @@ sub validate {
         # feature and the attachment is marked private).
         if ($status eq '?'
             && $flag_type->{is_requesteeble}
-            && trim($data->{"requestee_type-$id"}))
+            && trim($cgi->param("requestee_type-$id")))
         {
-            my $requestee_email = trim($data->{"requestee_type-$id"});
+            my $requestee_email = trim($cgi->param("requestee_type-$id"));
 
             # We know the requestee exists because we ran
             # Bugzilla::User::match_field before getting here.
@@ -370,7 +370,7 @@ sub validate {
             # the requestee isn't in the group of insiders who can see it.
             if ($attach_id
                 && Param("insidergroup")
-                && $data->{'isprivate'}
+                && $cgi->param('isprivate')
                 && !$requestee->in_group(Param("insidergroup")))
             {
                 ThrowUserError("flag_requestee_unauthorized_attachment",
-- 
cgit v1.2.3-24-g4f1b