merge 19364:19600 of rails_port into the openID branch

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

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 37510ac27890195411eca82643333c2552da7563..e6ef8a1c84f3136259da24f06212849ce22c14aa 100644 (file)
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -5,16 +5,6 @@ ActionMailer::Base.smtp_settings = {
   :domain => 'localhost',
 }
 
-# Monkey patch to fix return-path bug in ActionMailer 2.2.2
-# Can be removed once we go to 2.3
-module Net
-  class SMTP
-    def sendmail(msgstr, from_addr, *to_addrs)
-      send_message(msgstr, from_addr.to_s.sub(/^<(.*)>$/, "\\1"), *to_addrs)
-    end
-  end
-end
-
 # Monkey patch to allow sending of messages in specific locales
 module ActionMailer
   class Base