From c8813fe81d58aa880c15be782e5971825072fe44 Mon Sep 17 00:00:00 2001
From: Doug Bunting <dougbu@microsoft.com>
Date: Wed, 15 Oct 2014 21:53:23 -0700
Subject: [PATCH] Quick tag helper fixes - build break due to invalid XML
 comment in `TagHelperOutputExtensions`  - nit: correct "overridden" spelling
 in same comment - use `TagHelperOutputExtensions` in `TextAreaTagHelper`

---
 .../TagHelperOutputExtensions.cs                  |  4 ++--
 .../TextAreaTagHelper.cs                          | 15 ++++-----------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/TagHelperOutputExtensions.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/TagHelperOutputExtensions.cs
index 9b6ef20c2d..e271ef4857 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/TagHelperOutputExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.TagHelpers/TagHelperOutputExtensions.cs
@@ -78,13 +78,13 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
         }
 
         /// <summary>
-        /// Merges the given <see cref="tagBuilder"/>'s <see cref="TagBuilder.Attributes"/> into the 
+        /// Merges the given <paramref name="tagBuilder"/>'s <see cref="TagBuilder.Attributes"/> into the 
         /// <paramref name="tagHelperOutput"/>.
         /// </summary>
         /// <param name="tagHelperOutput">The <see cref="TagHelperOutput"/> this method extends.</param>
         /// <param name="tagBuilder">The <see cref="TagBuilder"/> to merge attributes from.</param>
         /// <remarks>Existing <see cref="TagHelperOutput.Attributes"/> on the given <paramref name="tagHelperOutput"/>
-        /// are not overriden; "class" attributes are merged with spaces.</remarks>
+        /// are not overridden; "class" attributes are merged with spaces.</remarks>
         public static void MergeAttributes(this TagHelperOutput tagHelperOutput, TagBuilder tagBuilder)
         {
             foreach (var attribute in tagBuilder.Attributes)
diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs
index 46f9a960f0..0f66052200 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs
+++ b/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs
@@ -40,18 +40,11 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
 
                 if (tagBuilder != null)
                 {
-                    output.SelfClosing = false;
-
-                    // TODO: Use infrastructure from PR #1322 to copy from tagBuilder.
-                    foreach (var attribute in tagBuilder.Attributes)
-                    {
-                        if (!output.Attributes.ContainsKey(attribute.Key))
-                        {
-                            output.Attributes.Add(attribute.Key, attribute.Value);
-                        }
-                    }
-
+                    // Overwrite current Content to ensure expression result round-trips correctly.
                     output.Content = tagBuilder.InnerHtml;
+
+                    output.MergeAttributes(tagBuilder);
+                    output.SelfClosing = false;
                     output.TagName = tagBuilder.TagName;
                 }
             }