2 files changed, 7 insertions, 7 deletions

diff --git a/actionpack/lib/action_view/helpers/tags/label.rb b/actionpack/lib/action_view/helpers/tags/label.rb
index 1bd71c2778..16135fcd5a 100644
--- a/actionpack/lib/action_view/helpers/tags/label.rb
+++ b/actionpack/lib/action_view/helpers/tags/label.rb
@@ -3,16 +3,16 @@ module ActionView
     module Tags
       class Label < Base #:nodoc:
         def initialize(object_name, method_name, template_object, content_or_options = nil, options = nil)
+          options ||= {}
+
           content_is_options = content_or_options.is_a?(Hash)
           if content_is_options
-            options = content_or_options
+            options.merge! content_or_options
             @content = nil
           else
             @content = content_or_options
           end
 
-          options ||= {}
-
           super(object_name, method_name, template_object, options)
         end
 
@@ -33,7 +33,7 @@ module ActionView
           options["for"] = name_and_id["id"] unless options.key?("for")
 
           if block_given?
-            @template_object.label_tag(name_and_id["id"], options, &block)
+            content = @template_object.capture(&block)
           else
             content = if @content.blank?
                         @object_name.gsub!(/\[(.*)_attributes\]\[\d\]/, '.\1')
@@ -55,9 +55,9 @@ module ActionView
                         end
 
             content ||= @method_name.humanize
-
-            label_tag(name_and_id["id"], content, options)
           end
+
+          label_tag(name_and_id["id"], content, options)
         end
       end
     end
diff --git a/actionpack/lib/action_view/helpers/tags/text_area.rb b/actionpack/lib/action_view/helpers/tags/text_area.rb
index 2e48850d5c..f74652c5e7 100644
--- a/actionpack/lib/action_view/helpers/tags/text_area.rb
+++ b/actionpack/lib/action_view/helpers/tags/text_area.rb
@@ -10,7 +10,7 @@ module ActionView
             options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
           end
 
-          content_tag("textarea", "\n#{options.delete('value') || value_before_type_cast(object)}", options)
+          content_tag("textarea", options.delete('value') || value_before_type_cast(object), options)
         end
       end
     end