diff --git a/framework/yii/widgets/ActiveField.php b/framework/yii/widgets/ActiveField.php index e3ac6af..00a28df 100644 --- a/framework/yii/widgets/ActiveField.php +++ b/framework/yii/widgets/ActiveField.php @@ -323,7 +323,9 @@ class ActiveField extends Component */ public function fileInput($options = array()) { - $options = array_merge($this->inputOptions, $options); + if ($this->inputOptions !== array('class' => 'form-control')) { + $options = array_merge($this->inputOptions, $options); + } $this->parts['{input}'] = Html::activeFileInput($this->model, $this->attribute, $options); return $this; }