Error202
/
yii2-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fixed test break.

tags/2.0.0-beta
Qiang Xue 12 years ago
parent
dd97c002a6
commit
726a305b7e
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      framework/yii/data/Sort.php

12
framework/yii/data/Sort.php
Unescape 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);
} }

Write Preview
Loading…
Cancel
Save