Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #2191 from resurtm/revert-chtml-changes-in-2186

CHtml changes introduced in #2186 reverted.
  • Loading branch information...
commit 56c5f8fe576413a042184637fc2f9738a80ecc1c 2 parents 1e3a178 + e67f7c1
@samdark samdark authored
Showing with 0 additions and 10 deletions.
  1. +0 −10 framework/web/helpers/CHtml.php
View
10 framework/web/helpers/CHtml.php
@@ -1585,11 +1585,6 @@ public static function activeTextArea($model,$attribute,$htmlOptions=array())
}
else
$text=self::resolveValue($model,$attribute);
-
- // https://github.com/yiisoft/yii/issues/1955
- if(is_array($text))
- $text='';
-
return self::tag('textarea',$htmlOptions,isset($htmlOptions['encode']) && !$htmlOptions['encode'] ? $text : self::encode($text));
}
@@ -2153,11 +2148,6 @@ protected static function activeInputField($type,$model,$attribute,$htmlOptions)
unset($htmlOptions['value']);
elseif(!isset($htmlOptions['value']))
$htmlOptions['value']=self::resolveValue($model,$attribute);
-
- // https://github.com/yiisoft/yii/issues/1955
- if(is_array($htmlOptions['value']))
- $htmlOptions['value']='';
-
if($model->hasErrors($attribute))
self::addErrorCss($htmlOptions);
return self::tag('input',$htmlOptions);
Please sign in to comment.
Something went wrong with that request. Please try again.