diff options
| author |   jocuri%softhome.net <> | 2005-01-09 02:35:23 +0000 |
|---|---|---|
| committer | jocuri%softhome.net <> | 2005-01-09 02:35:23 +0000 |
| commit | 5cf2f34814b817c4842288751939cf591d09e5d8 (patch) | |
| tree | 63eec991199bc5dba3bc54d3a342d6efee55b1b2 | |
| parent | Patch for bug 277013: provides a fix for the SQL error that appears when a us... (diff) | |
| download | bugzilla-5cf2f34814b817c4842288751939cf591d09e5d8.tar.gz bugzilla-5cf2f34814b817c4842288751939cf591d09e5d8.tar.bz2 bugzilla-5cf2f34814b817c4842288751939cf591d09e5d8.zip | |
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.
| -rw-r--r-- | Bugzilla/Flag.pm | 2 | ||||
| -rw-r--r-- | 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 02e0d64ca..37de4a720 100644 --- a/Bugzilla/Flag.pm +++ b/Bugzilla/Flag.pm @@ -603,7 +603,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 9e683cd99..b5da2f523 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> |