diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-09-05 09:06:55 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-09-05 09:06:55 +0000 |
| commit | 873be1258e5150a5e0decaf76cfa0c04c01ba54c (patch) | |
| tree | a9442e3e6cdd1813250b786e2478d8b713a1db8a /actionmailer | |
| parent | 258bacbf8221dc20a83cfaa03decfb522bda3ffb (diff) | |
| download | rails-873be1258e5150a5e0decaf76cfa0c04c01ba54c.tar.gz rails-873be1258e5150a5e0decaf76cfa0c04c01ba54c.tar.bz2 rails-873be1258e5150a5e0decaf76cfa0c04c01ba54c.zip | |
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
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 2 | ||||
| -rwxr-xr-x | actionmailer/lib/action_mailer.rb | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/mail_helper.rb | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 914e93a24b..f60c63312e 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -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 diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 5a24b0861e..40ad6f15e8 100755 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -38,7 +38,7 @@ require 'action_mailer/base' 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 diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb index 0235fcdc61..9c7370065f 100644 --- a/actionmailer/lib/action_mailer/mail_helper.rb +++ b/actionmailer/lib/action_mailer/mail_helper.rb @@ -1,4 +1,4 @@ -require 'action_mailer/vendor/text/format' +require 'text/format' module MailHelper#:nodoc: def block_format(text) @@ -14,4 +14,4 @@ module MailHelper#:nodoc: formatted end -end
\ No newline at end of file +end |