Don't allow STARTTLS to be used when sending mail

[rails.git] / config / initializers / action_mailer.rb

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index e6ef8a1c84f3136259da24f06212849ce22c14aa..e6181072bcb46e12390997d1767907c106fb8c1b 100644 (file)
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -3,26 +3,27 @@ ActionMailer::Base.smtp_settings = {
   :address => 'localhost',
   :port => 25, 
   :domain => 'localhost',
+  :enable_starttls_auto => false
 }
 
 # Monkey patch to allow sending of messages in specific locales
 module ActionMailer
   class Base
     adv_attr_accessor :locale
-  private
-    alias_method :old_render_message, :render_message
 
-    def render_message(method_name, body)
+    def mail_with_locale(*args)
       old_locale= I18n.locale
 
       begin
         I18n.locale = @locale
-        message = old_render_message(method_name, body)
+        message = mail_without_locale(*args)
       ensure
         I18n.locale = old_locale
       end
 
       message
     end
+
+    alias_method_chain :mail, :locale
   end
 end