diff --git a/CHANGELOG b/CHANGELOG index b5a2af8b2..2ed40b6b8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ Version 1.1.13 work in progress ------------------------------- +- Bug: Fixed can sorting cutted array with CArrayDataProvider (Yiivgeny) - Bug #93: Criteria modification in CActiveRecord::beforeFind() did not apply when record was loaded in relational context. See UPGRADE instructions for details on behavior change. (cebe) - Bug #110: MSSQL: fixed empty $primaryKey value after saving CActiveRecord model (resurtm) - Bug #112: MSSQL: database abstraction layer now uses native transaction support of the SQLSRV driver (resurtm) diff --git a/framework/web/CArrayDataProvider.php b/framework/web/CArrayDataProvider.php index 25cf03622..8ccb190ea 100644 --- a/framework/web/CArrayDataProvider.php +++ b/framework/web/CArrayDataProvider.php @@ -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); }