2 files changed, 26 insertions, 9 deletions
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index f7bdbd6917..24d9e9ffb5 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -371,13 +371,15 @@ module ActionView
     end
 
     def _render_partial(options, &block) #:nodoc:
-      if defined?(@renderer)
-        @renderer.setup(options, block)
-      else
-        @renderer = PartialRenderer.new(self, options, block)
-      end
+      _wrap_formats(options[:partial]) do
+        if defined?(@renderer)
+          @renderer.setup(options, block)
+        else
+          @renderer = PartialRenderer.new(self, options, block)
+        end
 
-      @renderer.render
+        @renderer.render
+      end
     end
 
   end
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 0771b40c37..8e599c71df 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -21,9 +21,11 @@ module ActionView
         elsif options.key?(:partial)
           _render_partial(options)
         else
-          template = _determine_template(options)
-          lookup_context.freeze_formats(template.formats, true)
-          _render_template(template, options[:layout], options)
+          _wrap_formats(options[:template] || options[:file]) do
+            template = _determine_template(options)
+            lookup_context.freeze_formats(template.formats, true)
+            _render_template(template, options[:layout], options)
+          end
         end
       when :update
         update_page(&block)
@@ -32,6 +34,19 @@ module ActionView
       end
     end
 
+    # Checks if the given path contains a format and if so, change
+    # the lookup context to take this new format into account.
+    def _wrap_formats(value)
+      return yield unless value.is_a?(String)
+      @@formats_regexp ||= /\.(#{Mime::SET.symbols.join('|')})$/
+
+      if value.sub!(@@formats_regexp, "")
+        update_details(:formats => [$1.to_sym]){ yield }
+      else
+        yield
+      end
+    end
+
     # Determine the template to be rendered using the given options.
     def _determine_template(options) #:nodoc:
       keys = (options[:locals] ||= {}).keys