From f942d7c2351ec060f3f5115a8875b68cb11559cc Mon Sep 17 00:00:00 2001
From: vfilippov <vfilippov@6955db30-a419-402b-8a0d-67ecbb4d7f56>
Date: Thu, 3 Dec 2009 13:58:52 +0000
Subject: [PATCH] Bug 55712

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@562 6955db30-a419-402b-8a0d-67ecbb4d7f56
---
 Bugzilla/Flag.pm | 14 ++++++++------
 process_bug.cgi  | 15 ---------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index 6ab2f72c7..1f22b965e 100644
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -447,12 +447,14 @@ sub _validate {
             # Note that if permissions on this bug are changed,
             # can_see_bug() will refer to old settings.
             if (!$requestee->can_see_bug($bug_id)) {
-                next if $skip_requestee_on_error;
-                ThrowUserError('flag_requestee_unauthorized',
-                               { flag_type  => $flag_type,
-                                 requestee  => $requestee,
-                                 bug_id     => $bug_id,
-                                 attach_id  => $attach_id });
+                # Bug 55712 - Add flag requestees to CC list
+                Bugzilla->cgi->param(-name => 'newcc', -value => [ Bugzilla->cgi->param('newcc'), $requestee->login ]);
+                #next if $skip_requestee_on_error;
+                #ThrowUserError('flag_requestee_unauthorized',
+                #               { flag_type  => $flag_type,
+                #                 requestee  => $requestee,
+                #                 bug_id     => $bug_id,
+                #                 attach_id  => $attach_id });
             }
 
             # Throw an error if the target is a private attachment and
diff --git a/process_bug.cgi b/process_bug.cgi
index ab953a643..9b43050c1 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -500,21 +500,6 @@ if (defined $cgi->param('newcc')
     push(@cc_remove, split(/[\s,]+/, $cc_remove)) if $cc_remove;
 }
 
-# CustIS Bug 55712 - Add flag requestees to CC
-for ($cgi->param)
-{
-    if (/^requestee_type-(\d+)$/so)
-    {
-        my $r = trim($cgi->param($_));
-        if ($bug_objects[0]->assigned_to->login ne $r &&
-            $bug_objects[0]->qa_contact->login ne $r &&
-            $bug_objects[0]->reporter->login ne $r)
-        {
-            push @cc_add, $r;
-        }
-    }
-}
-
 foreach my $b (@bug_objects) {
     $b->remove_cc($_) foreach @cc_remove;
     $b->add_cc($_) foreach @cc_add;