DNN-6281 Fixed label property ControlName

janjonas · bdukes · commit 7f14d858c3d2 · 2015-02-18T15:26:08.000-06:00
diff --git a/DNN Platform/Library/UI/UserControls/LabelControl.cs b/DNN Platform/Library/UI/UserControls/LabelControl.cs
@@ -271,7 +271,7 @@ protected override void OnPreRender(EventArgs e)
 				var c = Parent.FindControl(ControlName);
 				if (c != null)
 				{
-					//label.Attributes["for"] = c.ClientID;
+					label.Attributes["for"] = c.ClientID;
 				}
 			}
 		}
diff --git a/Website/controls/labelcontrol.ascx b/Website/controls/labelcontrol.ascx
@@ -1,7 +1,7 @@
 <%@ Control Language="C#" AutoEventWireup="false" Inherits="DotNetNuke.UI.UserControls.LabelControl" %>
 <div class="dnnLabel">    
-    <label>
-        <asp:Label ID="lblLabel" runat="server" EnableViewState="False"/>   
+    <label ID="label" runat="server" EnableViewState="false">
+        <asp:Label ID="lblLabel" runat="server" EnableViewState="False" />   
     </label>
     <asp:LinkButton ID="cmdHelp" TabIndex="-1" runat="server" CausesValidation="False"
         EnableViewState="False" CssClass="dnnFormHelp">        

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ protected override void OnPreRender(EventArgs e)`
`271`	`271`	`var c = Parent.FindControl(ControlName);`
`272`	`272`	`if (c != null)`
`273`	`273`	`{`
`274`		`- //label.Attributes["for"] = c.ClientID;`
	`274`	`+ label.Attributes["for"] = c.ClientID;`
`275`	`275`	`}`
`276`	`276`	`}`
`277`	`277`	`}`