From aa0d4e3a1aa4c7b728523ebd5b8da2cf9dd436a6 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com"
 <lpsolit%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 14 May 2007 19:27:16 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20379787:=20Flag=20request=20mail=20has=20a?=
 =?UTF-8?q?=20blank=20requestee=20when=20requestee=20doesn't=20get=20the?=
 =?UTF-8?q?=20mail=20-=20Patch=20by=20Fr=C3=83=C2=A9d=C3=83=C2=A9ric=20Buc?=
 =?UTF-8?q?lin=20<LpSolit@gmail.com>=20r=3Dwicked=20r=3Dmyk=20a=3DLpSolit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.0.0.236/trunk@226392 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/Bugzilla/Flag.pm                | 2 ++
 .../bugzilla/template/en/default/request/email.txt.tmpl   | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mozilla/webtools/bugzilla/Bugzilla/Flag.pm b/mozilla/webtools/bugzilla/Bugzilla/Flag.pm
index c3981d92bb0..7473ea1f1a8 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Flag.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Flag.pm
@@ -746,6 +746,7 @@ sub modify {
             my $requester;
             if ($flag->status eq '?') {
                 $requester = $flag->setter;
+                $flag->{'requester'} = $requester;
             }
             # Now update the flag object with its new values.
             $flag->{'setter'} = $setter;
@@ -905,6 +906,7 @@ sub clear {
     my $requester;
     if ($flag->status eq '?') {
         $requester = $flag->setter;
+        $flag->{'requester'} = $requester;
     }
 
     # Now update the flag object to its new values. The last
diff --git a/mozilla/webtools/bugzilla/template/en/default/request/email.txt.tmpl b/mozilla/webtools/bugzilla/template/en/default/request/email.txt.tmpl
index 1a20a4115a0..22c1ffbd692 100644
--- a/mozilla/webtools/bugzilla/template/en/default/request/email.txt.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/request/email.txt.tmpl
@@ -27,12 +27,14 @@
 [% attidsummary = attachment.id _ ': ' _ attachment.description %]
 [% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "canceled" ,
                 '?' => "asked" } %]
+
+[% to_identity = "" %]
 [% IF flag.status == '?' %]
-  [% to_identity = flag.addressee.identity _ " for" %]
+  [% to_identity = flag.requestee.identity _ " for" %]
   [% subject_status = "requested" %]
 [% ELSE %]
-  [% IF flag.addressee %]
-    [% to_identity = flag.addressee.identity _ "'s request for" %]
+  [% IF flag.requester %]
+    [% to_identity = flag.requester.identity _ "'s request for" %]
   [% END %]
   [% subject_status = statuses.${flag.status} %]
 [% END %]