Permalink
Browse files

Fix vendor require paths to prevent files being required twice

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2130 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 258bacb commit 873be1258e5150a5e0decaf76cfa0c04c01ba54c @jamis jamis committed Sep 5, 2005
Showing with 5 additions and 3 deletions.
  1. +2 −0 actionmailer/CHANGELOG
  2. +1 −1 actionmailer/lib/action_mailer.rb
  3. +2 −2 actionmailer/lib/action_mailer/mail_helper.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Fix vendor require paths to prevent files being required twice
+
* Don't add charset to content-type header for a part that contains subparts (for AOL compatibility) #2013 [John Long]
* Preserve underscores when unquoting message bodies #1930
@@ -38,7 +38,7 @@
require 'action_mailer/helpers'
require 'action_mailer/mail_helper'
require 'action_mailer/quoting'
-require 'action_mailer/vendor/tmail'
+require 'tmail'
require 'net/smtp'
ActionMailer::Base.class_eval do
@@ -1,4 +1,4 @@
-require 'action_mailer/vendor/text/format'
+require 'text/format'
module MailHelper#:nodoc:
def block_format(text)
@@ -14,4 +14,4 @@ def block_format(text)
formatted
end
-end
+end

0 comments on commit 873be12

Please sign in to comment.