Permalink
Browse files

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
  • Loading branch information...
1 parent ec4d407 commit 4b08caf3300e7ba96e637075cfd4162ff70f6558 @technoweenie technoweenie committed Apr 8, 2007
Showing with 3 additions and 1 deletion.
  1. +2 −0 actionmailer/CHANGELOG
  2. +1 −1 actionmailer/lib/action_mailer/base.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Only load ActionController::UrlWriter if ActionController is present [Rick Olson]
+
* Make sure parsed emails recognized attachments nested inside multipart parts. #6714 [Jamis Buck]
* Rename server_settings to smtp settings, and add sendmail_settings to allow you to override the arguments to and location of the sendmail executable. [Koz]
@@ -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.

0 comments on commit 4b08caf

Please sign in to comment.