diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-13 03:29:39 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-13 03:29:39 +0000 |
| commit | 928627292ce8d1c33589c574475a2edba105be73 (patch) | |
| tree | d83cb8ad6912eaf6cd6c6f69334083d408b8e338 /actionpack | |
| parent | 75b8a66638c0acff2fd7761a1e83befc35e5d0ba (diff) | |
| download | rails-928627292ce8d1c33589c574475a2edba105be73.tar.gz rails-928627292ce8d1c33589c574475a2edba105be73.tar.bz2 rails-928627292ce8d1c33589c574475a2edba105be73.zip | |
The mere existance of a rjs file shouldnt cause the layout to disappear. Made it easier to specify a :with on observer_field
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3859 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 0793178a93..da48dc3255 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1003,7 +1003,7 @@ module ActionController #:nodoc: end def template_exempt_from_layout?(template_name = default_template_name) - @template.pick_template_extension(template_name).to_sym == :rjs + template_name.last(3) == "rjs" || @template.pick_template_extension(template_name).to_sym == :rjs rescue false end |