Check whether blocks are called from erb using a special __in_erb_template variable visible in block binding.

2 files changed, 9 insertions, 2 deletions

diff --git a/actionpack/lib/action_view/template_handlers/compilable.rb b/actionpack/lib/action_view/template_handlers/compilable.rb
index 1aef81ba1a..783456ab53 100644
--- a/actionpack/lib/action_view/template_handlers/compilable.rb
+++ b/actionpack/lib/action_view/template_handlers/compilable.rb
@@ -106,7 +106,13 @@ module ActionView
           locals_code << "#{key} = local_assigns[:#{key}]\n"
         end
 
-        "def #{render_symbol}(local_assigns)\nold_output_buffer = output_buffer;#{locals_code}#{body}\nensure\nself.output_buffer = old_output_buffer\nend"
+        <<-end_src
+          def #{render_symbol}(local_assigns)
+            old_output_buffer = output_buffer;#{locals_code}#{body}
+          ensure
+            self.output_buffer = old_output_buffer
+          end
+        end_src
       end
 
       # Return true if the given template was compiled for a superset of the keys in local_assigns
diff --git a/actionpack/lib/action_view/template_handlers/erb.rb b/actionpack/lib/action_view/template_handlers/erb.rb
index 0733b3e3c2..458416b6cb 100644
--- a/actionpack/lib/action_view/template_handlers/erb.rb
+++ b/actionpack/lib/action_view/template_handlers/erb.rb
@@ -48,7 +48,8 @@ module ActionView
       self.erb_trim_mode = '-'
 
       def compile(template)
-        ::ERB.new(template.source, nil, erb_trim_mode, '@output_buffer').src
+        src = ::ERB.new(template.source, nil, erb_trim_mode, '@output_buffer').src
+        "__in_erb_template=true;#{src}"
       end
 
       def cache_fragment(block, name = {}, options = nil) #:nodoc: