mirror of
https://github.com/yiisoft/yii.git
synced 2026-02-19 17:11:23 +01:00
Fix: No casting to string in getSortingFieldValue().
This commit is contained in:
@@ -170,7 +170,8 @@ class CArrayDataProvider extends CDataProvider
|
||||
{
|
||||
foreach($fields as $field)
|
||||
$data = isset($data->$field) ? $data->$field : null;
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach($fields as $field)
|
||||
$data = isset($data[$field]) ? $data[$field] : null;
|
||||
@@ -178,7 +179,7 @@ class CArrayDataProvider extends CDataProvider
|
||||
// PHP 8.1+: avoid mb_strtolower(null, ...) deprecation when sort key is missing
|
||||
if($this->caseSensitiveSort || $data === null)
|
||||
return $data;
|
||||
return mb_strtolower((string)$data, Yii::app()->charset);
|
||||
return mb_strtolower($data, Yii::app()->charset);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user