Don't pass block binding to concat

8 files changed, 21 insertions, 31 deletions

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 7a603f150f..ad114acc6c 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -257,7 +257,7 @@ If you are rendering a subtemplate, you must now use controller-like partial syn
         if partial_layout = options.delete(:layout)
           if block_given?
             wrap_content_for_layout capture(&block) do 
-              concat(render(options.merge(:partial => partial_layout)), block.binding)
+              concat(render(options.merge(:partial => partial_layout)))
             end
           else
             wrap_content_for_layout render(options) do
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 0791feb9ac..63a932320e 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -249,9 +249,9 @@ module ActionView
           args.unshift object
         end
 
-        concat(form_tag(options.delete(:url) || {}, options.delete(:html) || {}), proc.binding)
+        concat(form_tag(options.delete(:url) || {}, options.delete(:html) || {}))
         fields_for(object_name, *(args << options), &proc)
-        concat('</form>', proc.binding)
+        concat('</form>')
       end
 
       def apply_form_for_options!(object_or_array, options) #:nodoc:
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index ca58f4ba26..3a97f1390f 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -407,10 +407,10 @@ module ActionView
       #   # => <fieldset><legend>Your details</legend><p><input id="name" name="name" type="text" /></p></fieldset>
       def field_set_tag(legend = nil, &block)
         content = capture(&block)
-        concat(tag(:fieldset, {}, true), block.binding)
-        concat(content_tag(:legend, legend), block.binding) unless legend.blank?
-        concat(content, block.binding)
-        concat("</fieldset>", block.binding)
+        concat(tag(:fieldset, {}, true))
+        concat(content_tag(:legend, legend)) unless legend.blank?
+        concat(content)
+        concat("</fieldset>")
       end
       
       private
@@ -442,9 +442,9 @@ module ActionView
         
         def form_tag_in_block(html_options, &block)
           content = capture(&block)
-          concat(form_tag_html(html_options), block.binding)
-          concat(content, block.binding)
-          concat("</form>", block.binding)
+          concat(form_tag_html(html_options))
+          concat(content)
+          concat("</form>")
         end
 
         def token_tag
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb
index 8c880dee2f..a2f2577636 100644
--- a/actionpack/lib/action_view/helpers/javascript_helper.rb
+++ b/actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -179,13 +179,7 @@ module ActionView
           content = content_or_options_with_block
         end
 
-        javascript_tag = content_tag("script", javascript_cdata_section(content), html_options.merge(:type => Mime::JS))
-        
-        if block_given? && block_is_within_action_view?(block)
-          concat(javascript_tag, block.binding)
-        else
-          javascript_tag
-        end
+        concat(content_tag("script", javascript_cdata_section(content), html_options.merge(:type => Mime::JS)))
       end
 
       def javascript_cdata_section(content) #:nodoc:
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index 602832e470..ed2abba17a 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -382,9 +382,9 @@ module ActionView
           args.unshift object
         end
 
-        concat(form_remote_tag(options), proc.binding)
+        concat(form_remote_tag(options))
         fields_for(object_name, *(args << options), &proc)
-        concat('</form>', proc.binding)
+        concat('</form>')
       end
       alias_method :form_remote_for, :remote_form_for
       
diff --git a/actionpack/lib/action_view/helpers/record_tag_helper.rb b/actionpack/lib/action_view/helpers/record_tag_helper.rb
index 66c596f3a9..9bb235175e 100644
--- a/actionpack/lib/action_view/helpers/record_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/record_tag_helper.rb
@@ -51,9 +51,8 @@ module ActionView
         prefix  = args.first.is_a?(Hash) ? nil : args.shift
         options = args.first.is_a?(Hash) ? args.shift : {}
         concat content_tag(tag_name, capture(&block), 
-          options.merge({ :class => "#{dom_class(record)} #{options[:class]}".strip, :id => dom_id(record, prefix) })), 
-          block.binding
+          options.merge({ :class => "#{dom_class(record)} #{options[:class]}".strip, :id => dom_id(record, prefix) }))
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index df3d69c0d8..e669620381 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -66,12 +66,9 @@ module ActionView
       def content_tag(name, content_or_options_with_block = nil, options = nil, escape = true, &block)
         if block_given?
           options = content_or_options_with_block if content_or_options_with_block.is_a?(Hash)
-          content = capture(&block)
-          content_tag = content_tag_string(name, content, options, escape)
-          block_is_within_action_view?(block) ? concat(content_tag, block.binding) : content_tag
+          concat(content_tag_string(name, capture(&block), options, escape))
         else
-          content = content_or_options_with_block
-          content_tag_string(name, content, options, escape)
+          content_tag_string(name, content_or_options_with_block, options, escape)
         end
       end
 
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 4711b84ae7..3be4843386 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -15,17 +15,17 @@ module ActionView
       #
       # ==== Examples
       #   <%
-      #       concat "hello", binding
+      #       concat "hello"
       #       # is the equivalent of <%= "hello" %>
       #
       #       if (logged_in == true):
-      #         concat "Logged in!", binding
+      #         concat "Logged in!"
       #       else
-      #         concat link_to('login', :action => login), binding
+      #         concat link_to('login', :action => login)
       #       end
       #       # will either display "Logged in!" or a login link
       #   %>
-      def concat(string, binding = nil)
+      def concat(string)
         if @output_buffer
           @output_buffer << string
         else