From b6e7cc63de744c08f7b310ab879ff20af17572e8 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 27 Mar 2006 23:43:50 +0000 Subject: [PATCH] Spell existence properly (closes #4442) git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4072 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/base.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index daa3c44ade661..61307c379c259 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -692,7 +692,7 @@ def render_action(action_name, status = nil, with_layout = true) def render_file(template_path, status = nil, use_full_path = false, locals = {}) add_variables_to_assigns - assert_existance_of_template_file(template_path) if use_full_path + assert_existence_of_template_file(template_path) if use_full_path logger.info("Rendering #{template_path}" + (status ? " (#{status})" : '')) if logger render_text(@template.render_file(template_path, use_full_path, locals), status) end @@ -995,7 +995,7 @@ def template_exempt_from_layout?(template_name = default_template_name) template_name =~ /\.rjs$/ || (@template.pick_template_extension(template_name) == :rjs rescue false) end - def assert_existance_of_template_file(template_name) + def assert_existence_of_template_file(template_name) unless template_exists?(template_name) || ignore_missing_templates full_template_path = @template.send(:full_template_path, template_name, 'rhtml') template_type = (template_name =~ /layouts/i) ? 'layout' : 'template'