php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-22 19:31:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed test break.

Browse Source
This commit is contained in:
Qiang Xue
2013-11-19 10:57:59 -05:00
parent dd97c002a6
commit 726a305b7e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework/yii/data/Sort.php
View File

@ -355,21 +355,21 @@ class Sort extends Object
$definition = $this->attributes[$attribute]; $definition = $this->attributes[$attribute];
$directions = $this->getAttributeOrders(); $directions = $this->getAttributeOrders();
if (isset($directions[$attribute])) { if (isset($directions[$attribute])) {
$descending = $directions[$attribute] !== SORT_DESC; $direction = $directions[$attribute] === SORT_DESC ? SORT_ASC : SORT_DESC;
unset($directions[$attribute]); unset($directions[$attribute]);
} else { } else {
$descending = isset($definition['default']) && $definition['default'] === SORT_DESC; $direction = isset($definition['default']) ? $definition['default'] : SORT_ASC;
} }
if ($this->enableMultiSort) { if ($this->enableMultiSort) {
$directions = array_merge([$attribute => $descending], $directions); $directions = array_merge([$attribute => $direction], $directions);
} else { } else {
$directions = [$attribute => $descending]; $directions = [$attribute => $direction];
} }
$sorts = []; $sorts = [];
foreach ($directions as $attribute => $descending) { foreach ($directions as $attribute => $direction) {
$sorts[] = $descending ? $attribute . $this->separators[1] . $this->descTag : $attribute; $sorts[] = $direction === SORT_DESC ? $attribute . $this->separators[1] . $this->descTag : $attribute;
} }
return implode($this->separators[0], $sorts); return implode($this->separators[0], $sorts);
} }