From 791905e8bbf925d7cd149f4473e863bfc1ec2ed5 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Mon, 9 Sep 2013 08:44:40 -0400 Subject: [PATCH] Reverted previous change as it breaks layout. --- framework/yii/widgets/ActiveField.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/framework/yii/widgets/ActiveField.php b/framework/yii/widgets/ActiveField.php index 6c06483..51f27ab 100644 --- a/framework/yii/widgets/ActiveField.php +++ b/framework/yii/widgets/ActiveField.php @@ -374,7 +374,6 @@ class ActiveField extends Component */ public function radio($options = array(), $enclosedByLabel = true) { - $options = array_merge($this->inputOptions, $options); if ($enclosedByLabel) { if (!isset($options['label'])) { $options['label'] = Html::encode($this->model->getAttributeLabel($this->attribute)); @@ -410,7 +409,6 @@ class ActiveField extends Component */ public function checkbox($options = array(), $enclosedByLabel = true) { - $options = array_merge($this->inputOptions, $options); if ($enclosedByLabel) { if (!isset($options['label'])) { $options['label'] = Html::encode($this->model->getAttributeLabel($this->attribute));