diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-01 21:19:23 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-01 21:19:23 +0000 |
| commit | 2a3dc59de04a7ddf9a9fb860508afb0488f7ac8e (patch) | |
| tree | 6b1216e26b71ba9fab35abf13409a67e33405a34 /actionpack | |
| parent | e47392b81faf9e96070379a18d525e25bd60678b (diff) | |
| download | rails-2a3dc59de04a7ddf9a9fb860508afb0488f7ac8e.tar.gz rails-2a3dc59de04a7ddf9a9fb860508afb0488f7ac8e.tar.bz2 rails-2a3dc59de04a7ddf9a9fb860508afb0488f7ac8e.zip | |
Don't inadvertently hit const_missing in defined?(ActionMailer::Base) check
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8249 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -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 a12574a09f..d20d52e157 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::Base) && controller.is_a?(ActionMailer::Base) && !template_path.include?("/") + if defined?(ActionMailer) && 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. |