Browse Source

Fixes #1060: added code comment

tags/2.0.0-beta
Qiang Xue 11 years ago
parent
commit
1bee84746c
  1. 2
      framework/yii/gii/generators/crud/templates/views/index.php
  2. 1
      framework/yii/widgets/ActiveField.php

2
framework/yii/gii/generators/crud/templates/views/index.php

@ -15,7 +15,7 @@ echo "<?php\n";
?>
use yii\helpers\Html;
use <?= $generator->indexWidgetType === 'grid' ? "yii\grid\GridView" : "yii\widgets\ListView" ?>;
use <?= $generator->indexWidgetType === 'grid' ? "yii\\grid\\GridView" : "yii\\widgets\\ListView" ?>;
/**
* @var yii\base\View $this

1
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);
}

Loading…
Cancel
Save