From 1bee84746c07232731cbaaf1e2735cca2a5955a3 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Fri, 1 Nov 2013 10:21:54 -0400 Subject: [PATCH] Fixes #1060: added code comment --- framework/yii/gii/generators/crud/templates/views/index.php | 2 +- framework/yii/widgets/ActiveField.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/yii/gii/generators/crud/templates/views/index.php b/framework/yii/gii/generators/crud/templates/views/index.php index d3cebcc..8543fad 100644 --- a/framework/yii/gii/generators/crud/templates/views/index.php +++ b/framework/yii/gii/generators/crud/templates/views/index.php @@ -15,7 +15,7 @@ echo " use yii\helpers\Html; -use indexWidgetType === 'grid' ? "yii\grid\GridView" : "yii\widgets\ListView" ?>; +use indexWidgetType === 'grid' ? "yii\\grid\\GridView" : "yii\\widgets\\ListView" ?>; /** * @var yii\base\View $this diff --git a/framework/yii/widgets/ActiveField.php b/framework/yii/widgets/ActiveField.php index fc30af5..dc97cbd 100644 --- a/framework/yii/widgets/ActiveField.php +++ b/framework/yii/widgets/ActiveField.php @@ -324,6 +324,7 @@ class ActiveField extends Component */ public function fileInput($options = []) { + // https://github.com/yiisoft/yii2/pull/795 if ($this->inputOptions !== ['class' => 'form-control']) { $options = array_merge($this->inputOptions, $options); }