Bug 379787: Flag request mail has a blank requestee when requestee doesn't get the...

diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index c3981d92bb0d7b279ec26550f8d1e66be34f7e97..7473ea1f1a80f68342de64691feb76dbbce72c96 100644 (file)
--- a/Bugzilla/Flag.pm
+++ b/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/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl
index a5fd17b88317997702233282e83ff3c32aec7801..9dddbe84547c855452ca4d35b5d929524e56534f 100644 (file)
--- a/template/en/default/request/email.txt.tmpl
+++ b/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 %]