aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/base.rb
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2007-04-08 21:24:48 +0000
committerRick Olson <technoweenie@gmail.com>2007-04-08 21:24:48 +0000
commit4b08caf3300e7ba96e637075cfd4162ff70f6558 (patch)
treee55a81fd5746328b718c9ac3223399d75e639bbb /actionmailer/lib/action_mailer/base.rb
parentec4d407d4f0c696a8ee7faae03f0c5d260c2b3ee (diff)
downloadrails-4b08caf3300e7ba96e637075cfd4162ff70f6558.tar.gz
rails-4b08caf3300e7ba96e637075cfd4162ff70f6558.tar.bz2
rails-4b08caf3300e7ba96e637075cfd4162ff70f6558.zip
Only load ActionController::UrlWriter if ActionController is present [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6510 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
-rw-r--r--actionmailer/lib/action_mailer/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 044ff46587..378168bc04 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -219,7 +219,7 @@ module ActionMailer #:nodoc:
# <tt>@implicit_parts_order</tt>.
class Base
include AdvAttrAccessor, PartContainer
- include ActionController::UrlWriter
+ include ActionController::UrlWriter if Object.const_defined?(:ActionController)
# Action Mailer subclasses should be reloaded by the dispatcher in Rails
# when Dependencies.mechanism = :load.