0
@@ -178,10 +178,7 @@ module ActionView #:nodoc:
0
     # that alert()s the caught exception (and then re-raises it). 
0
     @@debug_rjs = false
0
     cattr_accessor :debug_rjs
0
-    
0
-    @@erb_variable = '_erbout'
0
-    cattr_accessor :erb_variable
0
-    
0
+
0
     attr_internal :request
0
 
0
     delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers,

0
@@ -31,20 +31,13 @@ module ActionView
0
       #   </body></html>
0
       #
0
       def capture(*args, &block)
0
-        # execute the block
0
-        begin
0
-          buffer = eval(ActionView::Base.erb_variable, block.binding)
0
-        rescue
0
-          buffer = nil
0
-        end
0
-        
0
-        if buffer.nil?
0
-          capture_block(*args, &block).to_s
0
-        else
0
-          capture_erb_with_buffer(buffer, *args, &block).to_s
0
-        end
0
+        @output_buffer, old_buffer = '', @output_buffer
0
+        yield *args
0
+        @output_buffer
0
+      ensure
0
+        @output_buffer = old_buffer
0
       end
0
-      
0
+
0
       # Calling content_for stores a block of markup in an identifier for later use.
0
       # You can make subsequent calls to the stored content in other templates or the layout
0
       # by passing the identifier as an argument to <tt>yield</tt>.
0
@@ -121,40 +114,19 @@ module ActionView
0
       # named <tt>@content_for_#{name_of_the_content_block}</tt>. The preferred usage is now
0
       # <tt><%= yield :footer %></tt>.
0
       def content_for(name, content = nil, &block)
0
-        existing_content_for = instance_variable_get("@content_for_#{name}").to_s
0
-        new_content_for      = existing_content_for + (block_given? ? capture(&block) : content)
0
-        instance_variable_set("@content_for_#{name}", new_content_for)
0
+        ivar = "@content_for_#{name}"
0
+        instance_variable_set("@content_for_#{name}", "#{instance_variable_get(ivar)}#{block_given? ? capture(&block) : content}")
0
       end
0
 
0
       private
0
-        def capture_block(*args, &block)
0
-          block.call(*args)
0
-        end
0
-      
0
-        def capture_erb(*args, &block)
0
-          buffer = eval(ActionView::Base.erb_variable, block.binding)
0
-          capture_erb_with_buffer(buffer, *args, &block)
0
-        end
0
-      
0
-        def capture_erb_with_buffer(buffer, *args, &block)
0
-          pos = buffer.length
0
-          block.call(*args)
0
-        
0
-          # extract the block 
0
-          data = buffer[pos..-1]
0
-        
0
-          # replace it in the original with empty string
0
-          buffer[pos..-1] = ''
0
-        
0
-          data
0
-        end
0
-      
0
         def erb_content_for(name, &block)
0
-          eval "@content_for_#{name} = (@content_for_#{name} || '') + capture_erb(&block)"
0
+          ivar = "@content_for_#{name}"
0
+          instance_variable_set(ivar, "#{instance_variable_get(ivar)}#{capture(&block)}")
0
         end
0
-      
0
-        def block_content_for(name, &block)
0
-          eval "@content_for_#{name} = (@content_for_#{name} || '') + capture_block(&block)"
0
+
0
+        def block_content_for(name)
0
+          ivar = "@content_for_#{name}"
0
+          instance_variable_set(ivar, "#{instance_variable_get(ivar)}#{yield}")
0
         end
0
     end
0
   end

0
@@ -208,7 +208,7 @@ module ActionView
0
 
0
     private
0
       def block_is_within_action_view?(block)
0
-        eval("defined? _erbout", block.binding)
0
+        !@output_buffer.nil?
0
       end
0
     end
0
     

0
@@ -126,7 +126,7 @@ module ActionView
0
         end
0
 
0
         def block_is_within_action_view?(block)
0
-          eval("defined? _erbout", block.binding)
0
+          !@output_buffer.nil?
0
         end
0
     end
0
   end

0
@@ -25,8 +25,12 @@ module ActionView
0
       #       end
0
       #       # will either display "Logged in!" or a login link
0
       #   %>
0
-      def concat(string, binding)
0
-        eval(ActionView::Base.erb_variable, binding) << string
0
+      def concat(string, binding = nil)
0
+        if @output_buffer
0
+          @output_buffer << string
0
+        else
0
+          string
0
+        end
0
       end
0
 
0
       if RUBY_VERSION < '1.9'

0
@@ -43,13 +43,11 @@ module ActionView
0
       include Compilable
0
 
0
       def compile(template)
0
-        ::ERB.new(template.source, nil, @view.erb_trim_mode).src
0
+        ::ERB.new(template.source, nil, @view.erb_trim_mode, '@output_buffer').src
0
       end
0
 
0
       def cache_fragment(block, name = {}, options = nil) #:nodoc:
0
-        @view.fragment_for(block, name, options) do
0
-          eval(ActionView::Base.erb_variable, block.binding)
0
-        end
0
+        @view.fragment_for(block, name, options) { @view.output_buffer }
0
       end
0
     end
0
   end