Permalink
Browse files

Revert 'bc5896e'

  • Loading branch information...
1 parent 97a954b commit e0db925be04ab3e9c3db67dd0daa8caf3680dd21 @josh josh committed Jul 23, 2008
Showing with 4 additions and 8 deletions.
  1. +0 −3 actionpack/lib/action_view/base.rb
  2. +4 −5 actionpack/lib/action_view/partials.rb
@@ -332,9 +332,6 @@ def pick_template(template_path)
end
end
- extend ActiveSupport::Memoizable
- memoize :pick_template
-
private
# Renders the template present at <tt>template_path</tt>. The hash in <tt>local_assigns</tt>
# is made available as local variables.
@@ -102,8 +102,6 @@ module ActionView
#
# As you can see, the <tt>:locals</tt> hash is shared between both the partial and its layout.
module Partials
- extend ActiveSupport::Memoizable
-
private
def render_partial(partial_path, object_assigns = nil, local_assigns = {}) #:nodoc:
local_assigns ||= {}
@@ -131,12 +129,14 @@ def render_partial_collection(partial_path, collection, partial_spacer_template
local_assigns = local_assigns ? local_assigns.clone : {}
spacer = partial_spacer_template ? render(:partial => partial_spacer_template) : ''
+ _paths = {}
+ _templates = {}
index = 0
collection.map do |object|
_partial_path ||= partial_path || ActionController::RecordIdentifier.partial_path(object, controller.class.controller_path)
- path = find_partial_path(_partial_path)
- template = pick_template(path)
+ path = _paths[_partial_path] ||= find_partial_path(_partial_path)
+ template = _templates[path] ||= pick_template(path)
local_assigns[template.counter_name] = index
result = template.render_partial(self, object, local_assigns, as)
index += 1
@@ -153,6 +153,5 @@ def find_partial_path(partial_path)
"_#{partial_path}"
end
end
- memoize :find_partial_path
end
end

0 comments on commit e0db925

Please sign in to comment.