From 680eaae2b86f5940f8f74886abd653b941796a3b Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 23 Apr 2011 00:07:03 +0000
Subject: [PATCH] Bug 650624: Changing the requestee of a flag should not
 change the requester a=LpSolit

git-svn-id: svn://10.0.0.236/trunk@262221 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev          | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Flag.pm | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 41fc806d58a..9b678b4f54c 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-7780
\ No newline at end of file
+7781
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Flag.pm b/mozilla/webtools/bugzilla/Bugzilla/Flag.pm
index c4bd6fef65f..8457a559c89 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Flag.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Flag.pm
@@ -602,8 +602,6 @@ sub force_retarget {
 sub _set_requestee {
     my ($self, $requestee, $attachment, $skip_requestee_on_error) = @_;
 
-    # Used internally to check if the requestee is retargetting the request.
-    $self->{_old_requestee_id} = $self->requestee ? $self->requestee->id : 0;
     $self->{requestee} =
       $self->_check_requestee($requestee, $attachment, $skip_requestee_on_error);
 
@@ -725,9 +723,9 @@ sub _check_setter {
                           old_status => $self->{_old_status} });
     }
 
-    # If the requester is retargetting the request, we don't
-    # update the setter, so that the setter gets the notification.
-    if ($status eq '?' && $self->{_old_requestee_id} == $setter->id) {
+    # If the request is being retargetted, we don't update
+    # the setter, so that the setter gets the notification.
+    if ($status eq '?' && $self->{_old_status} eq '?') {
         return $self->setter;
     }
     return $setter;