public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-24 01:41:28 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into hookhead

Browse Source 
Conflicts:
	include/functions.php

changes for conflicts with master
This commit is contained in:
justauser
2013-07-07 13:57:06 -04:00
parent ef3a8db1cc e4e9ac1fc2
commit 3b96b0ed7c
10 changed files with 83 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/api.php
View File

@@ -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";