@@ -269,7 +269,7 @@ module Merb::RenderMixin with = [opts.delete(:with)].flatten as = opts.delete(:as) || template_location.match(%r[.*/_([^\.]*)])[1] - @_merb_partial_locals = opts.merge(:collection_index => 0, :collection_size => with.size) + @_merb_partial_locals = opts.merge(:collection_index => -1, :collection_size => with.size) # this handles an edge-case where the name of the partial is _foo.* and your opts # have :foo as a key. @@ -278,9 +278,8 @@ module Merb::RenderMixin sent_template = with.map do |temp| @_merb_partial_locals[as.to_sym] = temp unless named_local if template_method && self.respond_to?(template_method) - sent = send(template_method) @_merb_partial_locals[:collection_index] += 1 - sent + send(template_method) else raise TemplateNotFound, "Could not find template at #{template_location}.*" end lib/merb-core/controller/mixins/render.rb 088f956443e93d50d1b740e71b9454099efec73f Carl Lerche carllerche@mac.com http://github.com/wycats/merb-core/commit/df7306d346d9ee721f15e3adb0367f0c188f2e66 df7306d346d9ee721f15e3adb0367f0c188f2e66 2008-07-24T22:35:01-07:00 2008-07-24T22:35:01-07:00 Slight refactoring of the partial method 9c110235bd78b5b6c39a4336c6cc9d0cd036ce36 Carl Lerche carllerche@mac.com