1 files changed, 23 insertions, 14 deletions

diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index e337dcb63b..eacf117bea 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -171,11 +171,21 @@ module ActionView
   #   <% end %>
   module Partials
     extend ActiveSupport::Memoizable
+    extend ActiveSupport::Concern
+    
+    included do
+      attr_accessor :_partial      
+    end
+
+    def _render_partial_from_controller(*args)
+      @assigns_added = false
+      _render_partial(*args)
+    end
 
     def _render_partial(options = {}) #:nodoc:
       options[:locals] ||= {}
 
-      case path = partial = options[:partial]        
+      case path = partial = options[:partial]
       when *_array_like_objects
         return _render_partial_collection(partial, options)
       else
@@ -187,6 +197,7 @@ module ActionView
           path = ActionController::RecordIdentifier.partial_path(object, controller_path)
         end
         _, _, prefix, object = parts = partial_parts(path, options)
+        parts[1] = {:formats => parts[1]}
         template = find_by_parts(*parts)
         _render_partial_object(template, options, (object unless object == true))
       end
@@ -221,16 +232,7 @@ module ActionView
       ensure
         @_proc_for_layout = nil
       end
-  
-      def _render_partial_with_layout(layout, options)
-        if layout
-          prefix = controller && !layout.include?("/") ? controller.controller_path : nil
-          layout = find_by_parts(layout, formats, prefix, true)
-        end
-        content = _render_partial(options)
-        return _render_content_with_layout(content, layout, options[:locals])
-      end
-    
+      
       def _deprecated_ivar_assign(template)
         if respond_to?(:controller)
           ivar = :"@#{template.variable_name}"
@@ -253,7 +255,7 @@ module ActionView
       def _render_partial_with_layout(layout, options)
         if layout
           prefix = controller && !layout.include?("/") ? controller.controller_path : nil
-          layout = find_by_parts(layout, formats, prefix, true)
+          layout = find_by_parts(layout, {:formats => formats}, prefix, true)
         end
         content = _render_partial(options)
         return _render_content_with_layout(content, layout, options[:locals])
@@ -286,13 +288,17 @@ module ActionView
           locals = (options[:locals] ||= {})
           object ||= locals[:object] || locals[template.variable_name]
           
-          _set_locals(object, locals, template, options)          
+          _set_locals(object, locals, template, options)
+          
+          self._partial = template
+          
           _render_template(template, locals)
         end
       end
 
       def _set_locals(object, locals, template, options)
         object ||= _deprecated_ivar_assign(template)
+        
         locals[:object] = locals[template.variable_name] = object
         locals[options[:as]] = object if options[:as]
       end
@@ -315,13 +321,16 @@ module ActionView
           locals[template.counter_name] = index
           
           index += 1
+          
+          self._partial = template
+          
           _render_template(template, locals)
         end.join(spacer)
       end
 
       def _pick_partial_template(partial_path) #:nodoc:
         prefix = controller_path unless partial_path.include?('/')
-        find_by_parts(partial_path, formats, prefix, true)
+        find_by_parts(partial_path, {:formats => formats}, prefix, true)
       end
       memoize :_pick_partial_template
   end