Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-03 06:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed can sorting cutted array with CArrayDataProvider

Browse Source
This commit is contained in:
Evgeny Blinov
2012-10-04 18:56:56 +04:00
parent 86859cad61
commit cbc455dc55
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/web/CArrayDataProvider.php
View File

@@ -156,8 +156,12 @@ class CArrayDataProvider extends CDataProvider
*/
protected function getSortingFieldValue($data, $fields)
{
foreach ($fields as $field)
$data = is_object($data) ? $data->$field : $data[$field];
foreach($fields as $field){
if(is_object($data))
$data = isset($data->$field)?$data->$field:null;
else
$data = isset($data[$field])?$data[$field]:null;
}
return $this->caseSensitiveSort ? $data : mb_strtolower($data,Yii::app()->charset);
}