diff options
| author | justauser <[email protected]> | 2013-07-07 13:57:06 -0400 |
|---|---|---|
| committer | justauser <[email protected]> | 2013-07-07 13:57:06 -0400 |
| commit | 3b96b0ed7cf8d960dd3ec2208ad8addb584bc1c9 (patch) | |
| tree | d83db38f58511d5648b6bd665ab3760d74e73875 /classes/api.php | |
| parent | ef3a8db1cc83e02a9f8933869d19f299f2abe72a (diff) | |
| parent | e4e9ac1fc288d6715f6419cd4c8a44386362ecf0 (diff) | |
Merge branch 'master' into hookhead
Conflicts:
include/functions.php
changes for conflicts with master
Diffstat (limited to 'classes/api.php')
| -rw-r--r-- | classes/api.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/api.php b/classes/api.php index aa092df78..b3f4ebc2a 100644 --- a/classes/api.php +++ b/classes/api.php @@ -203,7 +203,7 @@ class API extends Handler { $override_order = false; switch ($_REQUEST["order_by"]) { case "date_reverse": - $override_order = "date_entered, updated"; + $override_order = "score DESC, date_entered, updated"; break; case "feed_dates": $override_order = "updated DESC"; |