From 6a35ed16c2c28c146a1da799983db56e3ca99e2e Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 23 Oct 2007 05:54:19 +0000 Subject: Remove duplicate rjs layout check. Closes #9956 [Josh Peek] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7999 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index b1fdea4635..ed81cfc092 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -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) -- cgit v1.2.3