diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-29 16:16:01 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-29 17:51:05 +0100 |
| commit | 3f8409193716669b9fa61ac74ae1c92cfde00785 (patch) | |
| tree | 0a7ff906de7b643f661c6dbfeb0b9ed5e4e38be7 /actionmailer/lib/action_mailer | |
| parent | 296007744525638b142501efee57faf6ac4be20f (diff) | |
| download | rails-3f8409193716669b9fa61ac74ae1c92cfde00785.tar.gz rails-3f8409193716669b9fa61ac74ae1c92cfde00785.tar.bz2 rails-3f8409193716669b9fa61ac74ae1c92cfde00785.zip | |
ActionMailer should depend just on AbstractController.
Diffstat (limited to 'actionmailer/lib/action_mailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 6 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/railtie.rb | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 6246530bf0..32959e3943 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -1,8 +1,3 @@ -require 'active_support/core_ext/class' -require 'active_support/core_ext/object/blank' -require 'active_support/core_ext/array/uniq_by' -require 'active_support/core_ext/module/delegation' -require 'active_support/core_ext/string/inflections' require 'mail' require 'action_mailer/tmail_compat' require 'action_mailer/collector' @@ -254,7 +249,6 @@ module ActionMailer #:nodoc: include AbstractController::LocalizedCache include AbstractController::Layouts include AbstractController::Helpers - include AbstractController::UrlFor include AbstractController::Translation helper ActionMailer::MailHelper diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb index 7ed1519e36..4ed70503fd 100644 --- a/actionmailer/lib/action_mailer/railtie.rb +++ b/actionmailer/lib/action_mailer/railtie.rb @@ -17,5 +17,9 @@ module ActionMailer ActionMailer::Base.send "#{k}=", v end end + + initializer "action_mailer.url_for" do |app| + ActionMailer::Base.send(:include, ActionController::UrlFor) if defined?(ActionController) + end end end
\ No newline at end of file |