Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Options are more often than not meaningless babble, just go nondescri…

…pt instead

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6275 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit e69390dffe29ccc798754bc5d251324b95b83c4d 1 parent b1ff3b4
@dhh dhh authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionpack/lib/action_controller/layout.rb
View
4 actionpack/lib/action_controller/layout.rb
@@ -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?
Please sign in to comment.
Something went wrong with that request. Please try again.