diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-12-05 18:16:04 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-12-05 18:16:04 +0000 |
| commit | cc0c4202be8a09b1d26adf12495b7f1b24957279 (patch) | |
| tree | 291cfd36812b69db2f37c1eb2b6663945045c1a6 | |
| parent | edf32cea3f7cfb1e485c1862e3db9d216484e23b (diff) | |
| download | rails-cc0c4202be8a09b1d26adf12495b7f1b24957279.tar.gz rails-cc0c4202be8a09b1d26adf12495b7f1b24957279.tar.bz2 rails-cc0c4202be8a09b1d26adf12495b7f1b24957279.zip | |
Ensure that ActionMailer::Base is there and not just the parent module
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8299 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index d20d52e157..af5fc433d8 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -276,7 +276,7 @@ module ActionView #:nodoc: # it's relative to the view_paths array, otherwise it's absolute. The hash in <tt>local_assigns</tt> # is made available as local variables. def render_file(template_path, use_full_path = true, local_assigns = {}) #:nodoc: - if defined?(ActionMailer) && controller.is_a?(ActionMailer::Base) && !template_path.include?("/") + if defined?(ActionMailer) && defined?(ActionMailer::Base) && controller.is_a?(ActionMailer::Base) && !template_path.include?("/") raise ActionViewError, <<-END_ERROR Due to changes in ActionMailer, you need to provide the mailer_name along with the template name. |