php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-01 11:39:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #19899: Fixed GridView in some cases calling Model::generateAttributeLabel() to generate label values that are never used

Browse Source
This commit is contained in:
PowerGamer1
2023-07-24 11:52:38 +03:00
committed by GitHub
parent 79c83ba7db
commit c8c0ea97c4
5 changed files with 95 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
framework/data/ActiveDataProvider.php
View File

@ -183,15 +183,11 @@ class ActiveDataProvider extends BaseDataProvider
$sort->attributes[$attribute] = [
'asc' => [$attribute => SORT_ASC],
'desc' => [$attribute => SORT_DESC],
'label' => $model->getAttributeLabel($attribute),
];
}
} else {
foreach ($sort->attributes as $attribute => $config) {
if (!isset($config['label'])) {
$sort->attributes[$attribute]['label'] = $model->getAttributeLabel($attribute);
}
}
}
if ($sort->modelClass === null) {
$sort->modelClass = $modelClass;
}
}
}