Skip to content
Browse files

The mere existance of a rjs file shouldnt cause the layout to disappe…

…ar. 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
  • Loading branch information...
1 parent 75b8a66 commit 928627292ce8d1c33589c574475a2edba105be73 @dhh dhh committed Mar 13, 2006
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionpack/lib/action_controller/base.rb
View
2 actionpack/lib/action_controller/base.rb
@@ -1003,7 +1003,7 @@ def template_public?(template_name = default_template_name)
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

0 comments on commit 9286272

Please sign in to comment.
Something went wrong with that request. Please try again.