Skip to content

Y
yii2
Commit 39c002e8 by Carsten Brandt
Options

Refactored DataColumn::renderHeaderCellContent()

parent 155749e1
Showing with 4 additions and 4 deletions
framework/yii/grid/DataColumn.php
...@@ -72,7 +72,10 @@ class DataColumn extends Column ...@@ -72,7 +72,10 @@ class DataColumn extends Column
protected function renderHeaderCellContent() protected function renderHeaderCellContent()
{ {
if ($this->header === null) { if ($this->header !== null || $this->label === null && $this->attribute === null) {
return parent::renderHeaderCellContent();
}
$provider = $this->grid->dataProvider; $provider = $this->grid->dataProvider;
if ($this->label === null) { if ($this->label === null) {
...@@ -100,9 +103,6 @@ class DataColumn extends Column ...@@ -100,9 +103,6 @@ class DataColumn extends Column
} else { } else {
return Html::encode($label); return Html::encode($label);
} }
} else {
return parent::renderHeaderCellContent();
}
} }
protected function renderFilterCellContent() protected function renderFilterCellContent()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment