diff options
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. |