diff options
| author | Rick Olson <technoweenie@gmail.com> | 2007-11-06 14:24:32 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2007-11-06 14:24:32 +0000 |
| commit | 2a51c8682d44ee71a3c0411e2e30ef8ff29d6f67 (patch) | |
| tree | 071f2cb958c46c0c07034c9837800dba572a5218 /actionmailer/lib/action_mailer.rb | |
| parent | 7464a398e18592010243845edad1fa09b82d16a1 (diff) | |
| download | rails-2a51c8682d44ee71a3c0411e2e30ef8ff29d6f67.tar.gz rails-2a51c8682d44ee71a3c0411e2e30ef8ff29d6f67.tar.bz2 rails-2a51c8682d44ee71a3c0411e2e30ef8ff29d6f67.zip | |
Update TMail to v1.1.0. Use an updated version of TMail if available. [mikel]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8084 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib/action_mailer.rb')
| -rwxr-xr-x | actionmailer/lib/action_mailer.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 4b3d5f35c1..28fe5b3cf7 100755 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -31,14 +31,23 @@ unless defined?(ActionController) end end +# attempt to load the TMail gem +begin + require 'rubygems' + gem 'TMail', '> 1.1.0' + require 'tmail' +rescue Gem::LoadError + # no gem, fall back to vendor copy +end + $:.unshift(File.dirname(__FILE__) + "/action_mailer/vendor/") +require 'tmail' require 'action_mailer/base' require 'action_mailer/helpers' require 'action_mailer/mail_helper' require 'action_mailer/quoting' require 'action_mailer/test_helper' -require 'tmail' require 'net/smtp' ActionMailer::Base.class_eval do |