merge forward to current rails/master

1 files changed, 7 insertions, 5 deletions

diff --git a/actionpack/lib/action_view/template_handlers/erb.rb b/actionpack/lib/action_view/template_handlers/erb.rb
index ad4ccc7c42..2f2febaa52 100644
--- a/actionpack/lib/action_view/template_handlers/erb.rb
+++ b/actionpack/lib/action_view/template_handlers/erb.rb
@@ -42,12 +42,14 @@ module ActionView
     class ERB < TemplateHandler
       include Compilable
 
-      def compile(template)
-        ::ERB.new(template.source, nil, @view.erb_trim_mode, '@output_buffer').src
-      end
+      # Specify trim mode for the ERB compiler. Defaults to '-'.
+      # See ERb documentation for suitable values.
+      cattr_accessor :erb_trim_mode
+      self.erb_trim_mode = '-'
 
-      def cache_fragment(block, name = {}, options = nil) #:nodoc:
-        @view.fragment_for(block, name, options) { @view.response.template.output_buffer ||= '' }
+      def compile(template)
+        src = ::ERB.new(template.source, nil, erb_trim_mode, '@output_buffer').src
+        "__in_erb_template=true;#{src}"
       end
     end
   end