From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 26 Feb 2008 18:30:24 +0000 (+0000)
Subject: Do not send an email with no recipient, cc or bcc (closes #743).
X-Git-Tag: 0.7.0-RC1~114
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8531e176aab6e3f4b6805aaa19af0b257b6cafb2;p=redmine.git

Do not send an email with no recipient, cc or bcc (closes #743).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1174 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 75a2e960b..ad5a3647b 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -122,7 +122,16 @@ class Mailer < ActionMailer::Base
     subject 'Redmine test'
     body :url => url_for(:controller => 'welcome')
   end
-  
+
+  # Overrides default deliver! method to prevent from sending an email
+  # with no recipient, cc or bcc
+  def deliver!(mail = @mail)
+    return false if (recipients.nil? || recipients.empty?) && 
+                    (cc.nil? || cc.empty?) &&
+                    (bcc.nil? || bcc.empty?)
+    super
+  end
+
   private
   def initialize_defaults(method_name)
     super