diff options
Diffstat (limited to 'actionmailer/lib/action_mailer.rb')
-rwxr-xr-x | actionmailer/lib/action_mailer.rb | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 28fe5b3cf7..ec803f5a8e 100755 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -31,23 +31,15 @@ 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 '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 'net/smtp' ActionMailer::Base.class_eval do |