diff options
| author | Rick Olson <technoweenie@gmail.com> | 2007-04-08 21:24:48 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2007-04-08 21:24:48 +0000 |
| commit | 4b08caf3300e7ba96e637075cfd4162ff70f6558 (patch) | |
| tree | e55a81fd5746328b718c9ac3223399d75e639bbb /actionmailer | |
| parent | ec4d407d4f0c696a8ee7faae03f0c5d260c2b3ee (diff) | |
| download | rails-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')
| -rw-r--r-- | actionmailer/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 6a2ef88e99..f2a2e0bee1 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -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] 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. |