github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-05 19:55:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate rjs layout check. Closes #9956 [Josh Peek]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7999 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2007-10-23 05:54:19 +00:00
parent 2559feb539
commit 6a35ed16c2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_controller/base.rb
View File

@@ -1230,7 +1230,7 @@ module ActionController #:nodoc:
def template_exempt_from_layout?(template_name = default_template_name)
extension = @template && @template.pick_template_extension(template_name)
name_with_extension = !template_name.include?('.') && extension ? "#{template_name}.#{extension}" : template_name
extension == :rjs || @@exempt_from_layout.any? { |ext| name_with_extension =~ ext }
@@exempt_from_layout.any? { |ext| name_with_extension =~ ext }
end
def assert_existence_of_template_file(template_name)