mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-26 03:01:22 +02:00
Code Issues Releases Wiki Activity

Fix up API default sort order

Browse Source
This commit is contained in:
Toby Zerner
2015-02-06 12:20:58 +10:30
parent 3644b99bf6
commit 7b9c65b5bc
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
framework/core/src/Flarum/Api/Actions/Base.php
View File

@@ -104,6 +104,11 @@ abstract class Base extends Controller
protected function sort($options) protected function sort($options)
{ {
$criteria = (string) $this->input('sort', ''); $criteria = (string) $this->input('sort', '');
if (! in_array($criteria, $options)) {
$criteria = reset($options);
}
$order = $criteria ? 'asc' : null; $order = $criteria ? 'asc' : null;
if ($criteria && $criteria[0] == '-') { if ($criteria && $criteria[0] == '-') {
@@ -111,10 +116,6 @@ abstract class Base extends Controller
$criteria = substr($criteria, 1); $criteria = substr($criteria, 1);
} }
if (! in_array($criteria, $options)) {
$criteria = reset($options);
}
return [ return [
'by' => $criteria, 'by' => $criteria,
'order' => $order, 'order' => $order,