Allow CHtml::activeLabel to override the automatically generated 'for…

…' attribute
yiisoft · Jun 24, 2009 · 60fd554 · 60fd554
1 parent 1ff28a4
commit 60fd554
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -19,6 +19,7 @@ Version 1.0.7 to be released
 - New: Rolled back the change about treating tinyint(1) in MySQL as boolean (Qiang)
 - New: Added support for displaying call stack information in trace messages (Qiang)
 - New: Added 'index' option to AR relations so that related objects can be indexed by specific column value (Qiang)
+- New: Allow CHtml::activeLabel to override the automatically generated 'for' attribute (Qiang)
 
 Version 1.0.6 June 7, 2009
 --------------------------

diff --git a/framework/web/helpers/CHtml.php b/framework/web/helpers/CHtml.php
@@ -984,7 +984,13 @@ protected static function inputField($type,$name,$value,$htmlOptions)
 	 */
 	public static function activeLabel($model,$attribute,$htmlOptions=array())
 	{
-		$for=self::getIdByName(self::resolveName($model,$attribute));
+		if(isset($htmlOptions['for']))
+		{
+			$for=$htmlOptions['for'];
+			unset($htmlOptions['for']);
+		}
+		else
+			$for=self::getIdByName(self::resolveName($model,$attribute));
 		if(isset($htmlOptions['label']))
 		{
 			$label=$htmlOptions['label'];