diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-23 05:54:19 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-23 05:54:19 +0000 |
| commit | 6a35ed16c2c28c146a1da799983db56e3ca99e2e (patch) | |
| tree | 996fcb6eaef1f3abc2dad3036898e7f268371291 /actionpack | |
| parent | 2559feb53923cd4ca1615b3c6c0c3a12ef7186d7 (diff) | |
| download | rails-6a35ed16c2c28c146a1da799983db56e3ca99e2e.tar.gz rails-6a35ed16c2c28c146a1da799983db56e3ca99e2e.tar.bz2 rails-6a35ed16c2c28c146a1da799983db56e3ca99e2e.zip | |
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
Diffstat (limited to 'actionpack')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) |