From f4d53a004593feb050e43c84fa09356c2dddc1e4 Mon Sep 17 00:00:00 2001
From: dougbu <dougbu@microsoft.com>
Date: Tue, 5 Aug 2014 11:59:55 -0700
Subject: [PATCH] Prefer `IHtmlHelper` methods elsewhere in our code - #847
 line 7 sub-bullets - don't call extension methods from our templates  -
 partially addressed in PR #934 (for methods changed there) - don't reference
 extension methods from XML comments

---
 .../Rendering/Html/DefaultEditorTemplates.cs              | 6 +++++-
 src/Microsoft.AspNet.Mvc.Core/ViewContext.cs              | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/DefaultEditorTemplates.cs b/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/DefaultEditorTemplates.cs
index 78f23cece9..ef320cdac3 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/DefaultEditorTemplates.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/DefaultEditorTemplates.cs
@@ -227,7 +227,11 @@ namespace Microsoft.AspNet.Mvc.Rendering
 
                 // TODO: add ModelMetadata.HideSurroundingHtml and use here (skip this block)
                 {
-                    var label = html.Label(propertyMetadata.PropertyName).ToString();
+                    var label = html.Label(
+                        propertyMetadata.PropertyName,
+                        labelText: null,
+                        htmlAttributes: null)
+                            .ToString();
                     if (!string.IsNullOrEmpty(label))
                     {
                         divTag.AddCssClass("editor-label");
diff --git a/src/Microsoft.AspNet.Mvc.Core/ViewContext.cs b/src/Microsoft.AspNet.Mvc.Core/ViewContext.cs
index 25024e8049..0f308cc93d 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ViewContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ViewContext.cs
@@ -65,14 +65,14 @@ namespace Microsoft.AspNet.Mvc
         public bool ClientValidationEnabled { get; set; }
 
         /// <summary>
-        /// Element name used to wrap a top-level message generated by
-        /// <see cref="HtmlHelperValidationExtensions.ValidationSummary(IHtmlHelper)"/> and other overloads.
+        /// Element name used to wrap a top-level message generated by <see cref="IHtmlHelper.ValidationSummary"/> and
+        /// other overloads.
         /// </summary>
         public string ValidationSummaryMessageElement { get; set; }
 
         /// <summary>
-        /// Element name used to wrap a top-level message generated by
-        /// <see cref="HtmlHelperValidationExtensions.ValidationMessage(IHtmlHelper, string)"/> and other overloads.
+        /// Element name used to wrap a top-level message generated by <see cref="IHtmlHelper.ValidationMessage"/> and
+        /// other overloads.
         /// </summary>
         public string ValidationMessageElement { get; set; }