From 0a99f5218fc9e86055f2cc04d680614d093c68da Mon Sep 17 00:00:00 2001
From: "jocuri%softhome.net" <>
Date: Sun, 9 Jan 2005 02:33:48 +0000
Subject: Patch for bug 277389: Modify flag notification code so it doesn't
 append emailsuffix to CC list's addresses; patch by Marc Schumann
 <wurblzap@gmail.com>, r=wurblzap, a=justdave.

---
 Bugzilla/Flag.pm                                   | 2 +-
 template/en/default/admin/flag-type/edit.html.tmpl | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index 8fa1e9457..57ea55982 100644
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -622,7 +622,7 @@ sub notify {
             next if $flag->{'target'}->{'attachment'}->{'isprivate'}
               && Param("insidergroup")
               && !$ccuser->in_group(Param("insidergroup"));
-            push(@new_cc_list, $cc.Param('emailsuffix'));
+            push(@new_cc_list, $cc);
         }
         $flag->{'type'}->{'cc_list'} = join(", ", @new_cc_list);
     }
diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl
index c735ac33d..8afbc38cb 100644
--- a/template/en/default/admin/flag-type/edit.html.tmpl
+++ b/template/en/default/admin/flag-type/edit.html.tmpl
@@ -163,7 +163,14 @@
     <tr>
       <th>CC List:</th>
       <td>
-        if requestable, who should get carbon copied on email notification of requests<br>
+        if requestable, who should get carbon copied on email notification of requests.
+        This is a comma-separated list of full e-mail addresses which do not
+        need to be [% terms.Bugzilla %] logins.
+        [% IF Param('emailsuffix') %]
+          Note that the configured emailsuffix
+          <kbd>[% Param('emailsuffix') %]</kbd> will <em>not</em> be appended
+          to these addresses, so you should add it explicitly if so desired.
+        [% END %]<br>
         <input type="text" name="cc_list" value="[% type.cc_list FILTER html %]" size="80" maxlength="200">
       </td>
     </tr>
-- 
cgit v1.2.3-24-g4f1b