[whimsy] 02/02: fix cc computation

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git

commit 5fec5377290a9d6b08e5d9523c9cf14d324ed276
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sun Sep 18 21:14:14 2016 -0400

    fix cc computation
---
 www/secmail/templates/acreq.erb        | 1 -
 www/secmail/views/actions/icla.json.rb | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/secmail/templates/acreq.erb b/www/secmail/templates/acreq.erb
index 88e222e..2b2a073 100644
--- a/www/secmail/templates/acreq.erb
+++ b/www/secmail/templates/acreq.erb
@@ -1,6 +1,5 @@
 To:   root@apache.org
 From: <%= @from %>
-Cc:   <%= @pubname.inspect %> <<%= @email %>>
 Subject: [FORM] Account Request - <%= @email %>: <%= @pubname %>
 
 Prospective userid: <%= @user %>
diff --git a/www/secmail/views/actions/icla.json.rb b/www/secmail/views/actions/icla.json.rb
index f53f331..844e2eb 100644
--- a/www/secmail/views/actions/icla.json.rb
+++ b/www/secmail/views/actions/icla.json.rb
@@ -187,7 +187,7 @@ if @user and not @user.empty? and pmc and not @votelink.empty?
     mail = Mail.new(template('acreq.erb'))
 
     # adjust copy lists
-    cc = mail.cc.split(',') # from the template
+    cc = ["#{@pubname.inspect} <#{@email}>"]
     cc << "private@#{pmc.mail_list}.apache.org" if pmc # copy pmc
     cc << podling.private_mail_list if podling # copy podling
     mail.cc = cc.uniq.map {|email| email.dup.untaint}

-- 
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.