aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/renderer
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-12-12 00:20:07 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-01-08 09:15:20 -0200
commitc67005f221f102fe2caca231027d9b11cf630484 (patch)
tree06bcbb633c6c2c4808091fe9ccf4dd8a164b06d1 /actionpack/lib/action_view/renderer
parent77516a712b5f10d14727d807697272b4607db7bc (diff)
downloadrails-c67005f221f102fe2caca231027d9b11cf630484.tar.gz
rails-c67005f221f102fe2caca231027d9b11cf630484.tar.bz2
rails-c67005f221f102fe2caca231027d9b11cf630484.zip
Do not generate local vars for partials without object or collection
Previously rendering a partial without giving :object or :collection would generate a local variable with the partial name by default. This was noticed due to warnings in Ruby 2.0 of not used variables, which turned out to be the generation of not used variables inside partials that do not contain objects related to them.
Diffstat (limited to 'actionpack/lib/action_view/renderer')
-rw-r--r--actionpack/lib/action_view/renderer/partial_renderer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index 37f93a13fc..43a88b0623 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -452,7 +452,7 @@ module ActionView
def retrieve_template_keys
keys = @locals.keys
- keys << @variable
+ keys << @variable if @object || @collection
keys << @variable_counter if @collection
keys
end