github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-30 00:38:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only load ActionController::UrlWriter if ActionController is present [Rick Olson]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6510 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Rick Olson
2007-04-08 21:24:48 +00:00
parent ec4d407d4f
commit 4b08caf330
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionmailer/CHANGELOG
View File

@@ -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]

2
actionmailer/lib/action_mailer/base.rb
View File

@@ -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.