0
@@ -12,7 +12,7 @@ module ActionView
0
     end
0
 
0
     def method
0
-      ['_run', @extension, @method_segment].compact.join('_').to_sym
0
+      ['_run', @extension, @method_segment, local_assigns_keys].compact.join('_').to_sym
0
     end
0
 
0
     private
0
@@ -28,5 +28,11 @@ module ActionView
0
           @prepared = true
0
         end
0
       end
0
+
0
+      def local_assigns_keys
0
+        if @locals && @locals.any?
0
+          "locals_#{@locals.keys.map { |k| k.to_s }.sort.join('_')}"
0
+        end
0
+      end
0
   end
0
 end

0
@@ -20,7 +20,7 @@ module ActionView #:nodoc:
0
       set_extension_and_file_name
0
 
0
       @method_segment = compiled_method_name_file_path_segment
0
-      @locals = locals || {}
0
+      @locals = (locals && locals.dup) || {}
0
       @handler = self.class.handler_class_for_extension(@extension).new(@view)
0
     end
0
 

0
@@ -5,9 +5,6 @@ module ActionView
0
         base.extend ClassMethod
0
 
0
         @@mutex = Mutex.new
0
-
0
-        # Map method names to the compiled local assigns
0
-        @@template_args = {}
0
       end
0
 
0
       module ClassMethod
0
@@ -26,11 +23,7 @@ module ActionView
0
         return false unless recompile_template?(template)
0
 
0
         @@mutex.synchronize do
0
-          locals_code = ""
0
-          locals_keys = cache_template_args(template.method, template.locals)
0
-          locals_keys.each do |key|
0
-            locals_code << "#{key} = local_assigns[:#{key}];"
0
-          end
0
+          locals_code = template.locals.keys.map { |key| "#{key} = local_assigns[:#{key}];" }.join
0
 
0
           source = <<-end_src
0
             def #{template.method}(local_assigns)
0
@@ -69,25 +62,9 @@ module ActionView
0
           # Always recompile inline templates
0
           return true if template.is_a?(InlineTemplate)
0
 
0
-          # Unless local assigns support, recompile
0
-          return true unless supports_local_assigns?(template.method, template.locals)
0
-
0
           # Otherwise, use compiled method
0
           return false
0
         end
0
-
0
-        def cache_template_args(render_symbol, local_assigns)
0
-          @@template_args[render_symbol] ||= {}
0
-          locals_keys = @@template_args[render_symbol].keys | local_assigns.keys
0
-          @@template_args[render_symbol] = locals_keys.inject({}) { |h, k| h[k] = true; h }
0
-          locals_keys
0
-        end
0
-
0
-        # Return true if the given template was compiled for a superset of the keys in local_assigns
0
-        def supports_local_assigns?(render_symbol, local_assigns)
0
-          local_assigns.empty? ||
0
-            ((args = @@template_args[render_symbol]) && local_assigns.all? { |k,_| args.has_key?(k) })
0
-        end
0
     end
0
   end
0
 end