Ticket #10733: cache_extension_r8787.diff

actionpack/lib/action_view/base.rb

@@ -158 +158 @@
-    attr_internal :cookies, :flash, :headers, :params, :request, :response, :session
-    
-    attr_writer :template_format
+    attr_accessor :current_render_extension
-
-    # Specify trim mode for the ERB compiler. Defaults to '-'.
-    # See ERb documentation for suitable values.
@@ -358 +359 @@
-    # The hash in <tt>local_assigns</tt> is made available as local variables.
-    def render_template(template_extension, template, file_path = nil, local_assigns = {}) #:nodoc:
-      handler = self.class.handler_class_for_extension(template_extension).new(self)
+      @current_render_extension = template_extension
-
-      if handler.compilable?
-        compile_and_render_template(handler, template, file_path, local_assigns)

actionpack/lib/action_view/helpers/cache_helper.rb

@@ -32 +32 @@
-      #      <i>Topics listed alphabetically</i>
-      #    <% end %>
-      def cache(name = {}, options = nil, &block)
-
-
+
-        handler.new(@controller).cache_fragment(block, name, options)
-      end
-    end