Bug 226932: flag request email sends ' ' in subject. Remove

entities that were introduced by the fix for bug 13540. Patch by Stephen
Reindl <sr@stephenreindl.de>, r=kiko, a=justdave

diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl
index 9024a6fe06f9963a0030d1aedf6deca6ef203730..719f9d8696c4bdc42ede8b30fa10f06773913ef1 100644 (file)
--- a/template/en/default/request/email.txt.tmpl
+++ b/template/en/default/request/email.txt.tmpl
@@ -39,7 +39,7 @@
 From: bugzilla-request-daemon
 To: [% to_email %]
 CC: [% flag.type.cc_list %]
-Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %] [% flag.target.bug.id %]] [% flag.target.bug.summary %]
+Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %] [%+ flag.target.bug.id %]] [% flag.target.bug.summary %]
 [%- IF flag.target.attachment.exists %] :
   [Attachment [% flag.target.attachment.id %]] [% flag.target.attachment.summary %][% END %]
 
@@ -48,7 +48,7 @@ Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %] [% fl
 
 [% user.identity %] has [% statuses.${flag.status} %] [%+ to_identity %] for [% flag.type.name %]:
 
-[% terms.Bug %] [% bugidsummary %]
+[% terms.Bug %] [%+ bugidsummary %]
 [% END %]
 [%+ Param('urlbase') %]show_bug.cgi?id=[% flag.target.bug.id %]
 [% IF flag.target.attachment.exists %]