diff options
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index b0b6069420..0793178a93 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1003,7 +1003,9 @@ module ActionController #:nodoc: end def template_exempt_from_layout?(template_name = default_template_name) - @template.javascript_template_exists?(template_name) + @template.pick_template_extension(template_name).to_sym == :rjs + rescue + false end def assert_existance_of_template_file(template_name) |