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

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6275 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
上级 b1ff3b48
......@@ -240,7 +240,7 @@ def render_with_a_layout(options = nil, deprecated_status = nil, deprecated_layo
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 @@ def render_with_a_layout(options = nil, deprecated_status = nil, deprecated_layo
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?
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册