[#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.

[#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.
f333f43a · Felix Schäfer · add0bf4d · f333f43a
Commit f333f43a authored Nov 30, 2011 by Felix Schäfer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mailer.rb app/models/mailer.rb +2 -2

No files found.
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -396,8 +396,8 @@ class Mailer < ActionMailer::Base
    # if he doesn't want to receive notifications about what he does
    @author ||= User.current
    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
    notified_users = [recipients, cc].flatten.compact.uniq