From 399108ea7381ed961c33bbfdafec78824fe737da Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Tue, 15 May 2007 00:25:21 +0000 Subject: Bug 379787: Flag request mail has a blank requestee when requestee doesn't get the mail - Patch by Frédéric Buclin r=wicked r=myk a=LpSolit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/en/default/request/email.txt.tmpl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'template') diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl index 1a20a4115..22c1ffbd6 100644 --- 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 %] -- cgit v1.2.3-24-g4f1b