Refactored DataColumn::renderHeaderCellContent()

framework/yii/grid/DataColumn.php

@@ -72,7 +72,10 @@ class DataColumn extends Column
 
 	protected function renderHeaderCellContent()
 	{
-		if ($this->header === null) {
+		if ($this->header !== null || $this->label === null && $this->attribute === null) {
+			return parent::renderHeaderCellContent();
+		}
+
 		$provider = $this->grid->dataProvider;
 
 		if ($this->label === null) {
@@ -100,9 +103,6 @@ class DataColumn extends Column
 		} else {
 			return Html::encode($label);
 		}
-		} else {
-			return parent::renderHeaderCellContent();
-		}
 	}
 
 	protected function renderFilterCellContent()