From 2a3dc59de04a7ddf9a9fb860508afb0488f7ac8e Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 1 Dec 2007 21:19:23 +0000 Subject: [PATCH] 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 --- actionpack/lib/action_view/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index a12574a09f24..d20d52e15796 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -276,7 +276,7 @@ def initialize(view_paths = [], assigns_for_first_render = {}, controller = nil) # it's relative to the view_paths array, otherwise it's absolute. The hash in local_assigns # 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.