merge forward to current rails/master

1 files changed, 11 insertions, 9 deletions

diff --git a/actionpack/lib/action_view/inline_template.rb b/actionpack/lib/action_view/inline_template.rb
index fd0ad48302..5e00cef13f 100644
--- a/actionpack/lib/action_view/inline_template.rb
+++ b/actionpack/lib/action_view/inline_template.rb
@@ -1,17 +1,19 @@
 module ActionView #:nodoc:
-  class InlineTemplate < Template #:nodoc:
-    def initialize(view, source, locals = {}, type = nil)
-      @view = view
+  class InlineTemplate #:nodoc:
+    include Renderable
 
+    attr_reader :source, :extension, :method_segment
+
+    def initialize(source, type = nil)
       @source = source
       @extension = type
-      @locals = locals || {}
-
-      @handler = self.class.handler_class_for_extension(@extension).new(@view)
+      @method_segment = "inline_#{@source.hash.abs}"
     end
 
-    def method_key
-      @source
-    end
+    private
+      # Always recompile inline templates
+      def recompile?(local_assigns)
+        true
+      end
   end
 end