aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/digestor.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2016-02-16 15:26:16 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2016-02-16 15:34:17 -0800
commitd72c5df17badedf3100ef02a7638648f98beeeef (patch)
tree7e94683453c6ef2760b09a75d5c8fd1a0193ac8f /actionview/lib/action_view/digestor.rb
parent7f86f2d3cc2a5bbb113aae7b5475b0c57d758a5f (diff)
downloadrails-d72c5df17badedf3100ef02a7638648f98beeeef.tar.gz
rails-d72c5df17badedf3100ef02a7638648f98beeeef.tar.bz2
rails-d72c5df17badedf3100ef02a7638648f98beeeef.zip
fix rake tasks
Diffstat (limited to 'actionview/lib/action_view/digestor.rb')
-rw-r--r--actionview/lib/action_view/digestor.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionview/lib/action_view/digestor.rb b/actionview/lib/action_view/digestor.rb
index 08afa51135..bd86d5c088 100644
--- a/actionview/lib/action_view/digestor.rb
+++ b/actionview/lib/action_view/digestor.rb
@@ -49,8 +49,8 @@ module ActionView
if finder.disable_cache { finder.exists?(logical_name, [], partial) }
template = finder.disable_cache { finder.find(logical_name, [], partial) }
- if obj = seen[template.identifier]
- obj
+ if node = seen[template.identifier] # handle cycles in the tree
+ node
else
node = seen[template.identifier] = Node.create(name, logical_name, template, partial)
@@ -109,11 +109,11 @@ module ActionView
class Partial < Node; end
class Missing < Node
- def digest(_ = []); '' end
+ def digest(_ = []) '' end
end
class Injected < Node
- def digest(_ = []); name end
+ def digest(_ = []) name end
end
class NullLogger