diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-03-01 23:27:04 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-03-01 23:27:04 +0000 |
| commit | e69390dffe29ccc798754bc5d251324b95b83c4d (patch) | |
| tree | 2fdb5690fd6def969cc54046bacf4853ef22703c /actionpack/lib/action_controller | |
| parent | b1ff3b48e27f85bce35857c02d1d90297bb0db5f (diff) | |
| download | rails-e69390dffe29ccc798754bc5d251324b95b83c4d.tar.gz rails-e69390dffe29ccc798754bc5d251324b95b83c4d.tar.bz2 rails-e69390dffe29ccc798754bc5d251324b95b83c4d.zip | |
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
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index d5d38e2a9a..115fd7ac18 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -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? |