From: Tom Hughes <tom@compton.nu>
Date: Thu, 4 Jun 2009 09:22:31 +0000 (+0000)
Subject: Removed patch for rails 2.2 bug.
X-Git-Tag: live~7227
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/983dbb5353f819c513cd36a25321e2714d27b3ac?ds=sidebyside

Removed patch for rails 2.2 bug.
---

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 37510ac27..e6ef8a1c8 100644
--- 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