kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[#736] force recipients/cc to arrays in the Mailer 

String#delete might break on 1.9 with dashes in the author's email address. Furthermore, String#delete doesn't do what the original author thought it does.
This commit is contained in:
Felix Schäfer 2011-11-30 18:04:09 +01:00
parent add0bf4d0a
commit f333f43a57
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/mailer.rb
View File

@ -396,8 +396,8 @@ class Mailer < ActionMailer::Base
# if he doesn't want to receive notifications about what he does # if he doesn't want to receive notifications about what he does
@author ||= User.current @author ||= User.current
if @author.pref[:no_self_notified] if @author.pref[:no_self_notified]
recipients.delete(@author.mail) if recipients recipients((recipients.is_a?(Array) ? recipients : [recipients]) - [@author.mail]) if recipients
cc.delete(@author.mail) if cc cc((cc.is_a?(Array) ? cc : [cc]) - [@author.mail]) if cc
end end
notified_users = [recipients, cc].flatten.compact.uniq notified_users = [recipients, cc].flatten.compact.uniq