kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Options are more often than not meaningless babble, just go nondescript instead

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6275 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2007-03-01 23:27:04 +00:00
parent b1ff3b48e2
commit e69390dffe
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
actionpack/lib/action_controller/layout.rb
View file

@ -240,7 +240,7 @@ module ActionController #:nodoc:
assert_existence_of_template_file(layout)
options = options.merge :layout => false if template_with_options
logger.info("Rendering #{options} within #{layout}") if logger
logger.info("Rendering template within #{layout}") if logger
if template_with_options
content_for_layout = render_with_no_layout(options, &block)
@ -259,8 +259,8 @@ module ActionController #:nodoc:
end
end
private
def apply_layout?(template_with_options, options)
return false if options == :update
template_with_options ? candidate_for_layout?(options) : !template_exempt_from_layout?