diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-27 23:43:50 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-27 23:43:50 +0000 |
commit | b6e7cc63de744c08f7b310ab879ff20af17572e8 (patch) | |
tree | d02bc173e0657421ad152153b7640d32eff6ed70 /actionpack/lib | |
parent | 80081d18f23c6ad5952ba2620fabd06577503735 (diff) | |
download | rails-b6e7cc63de744c08f7b310ab879ff20af17572e8.tar.gz rails-b6e7cc63de744c08f7b310ab879ff20af17572e8.tar.bz2 rails-b6e7cc63de744c08f7b310ab879ff20af17572e8.zip |
Spell existence properly (closes #4442)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4072 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rwxr-xr-x | actionpack/lib/action_controller/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index daa3c44ade..61307c379c 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -692,7 +692,7 @@ module ActionController #:nodoc: 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 @@ module ActionController #:nodoc: 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' |