From 882dcc873146d665f2d1257b89e588ae6e6356f0 Mon Sep 17 00:00:00 2001
From: "gerv%gerv.net" <>
Date: Wed, 30 Mar 2005 05:42:53 +0000
Subject: Bug 73665 - migrate email preferences to their own table, and
 rearchitect email internals. Patch by gerv; r=jake, a=justdave.

---
 template/en/default/request/email.txt.tmpl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'template/en/default/request')

diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl
index 719f9d869..53af6e5d7 100644
--- a/template/en/default/request/email.txt.tmpl
+++ b/template/en/default/request/email.txt.tmpl
@@ -28,11 +28,13 @@
 [% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "cancelled" ,
                 '?' => "asked" } %]
 [% IF flag.status == '?' %]
-   [% to_email = flag.requestee.email IF flag.requestee.email_prefs.FlagRequestee %]
+   [% to_email = flag.requestee.email 
+                   IF flag.requestee.wants_mail(constants.EVT_FLAG_REQUESTED) %]
    [% to_identity = flag.requestee.identity %]
    [% subject_status = "requested" %]
 [% ELSE %]
-   [% to_email = flag.setter.email IF flag.setter.email_prefs.FlagRequester %]
+   [% to_email = flag.setter.email 
+                      IF flag.setter.wants_mail(constants.EVT_REQUESTED_FLAG) %]
    [% to_identity = flag.setter.identity _ "'s request" %]
    [% subject_status = statuses.${flag.status} %]
 [% END %]
-- 
cgit v1.2.3-24-g4f1b