1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-29 19:51:28 +00:00

retire frankly ridiculous sorting by score/title/date/default

keep defaul and oldest first instead of REVERSE_HEADLINES
This commit is contained in:
Andrew Dolgov
2013-03-28 20:44:43 +04:00
parent 699e3cfc65
commit b9a06a0e39
7 changed files with 31 additions and 69 deletions

View File

@@ -869,28 +869,8 @@ class Feeds extends Handler_Protected {
}
switch ($order_by) {
case "date":
if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) {
$override_order = "$date_sort_field, updated";
} else {
$override_order = "$date_sort_field DESC, updated DESC";
}
break;
case "title":
if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) {
$override_order = "title DESC, $date_sort_field, updated";
} else {
$override_order = "title, $date_sort_field DESC, updated DESC";
}
break;
case "score":
if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) {
$override_order = "score, $date_sort_field, updated";
} else {
$override_order = "score DESC, $date_sort_field DESC, updated DESC";
}
case "date_reverse":
$override_order = "$date_sort_field, updated";
break;
}

View File

@@ -121,7 +121,7 @@ class Pref_Prefs extends Handler_Protected {
global $access_level_names;
$prefs_blacklist = array("STRIP_UNSAFE_TAGS");
$prefs_blacklist = array("STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES");
/* "FEEDS_SORT_BY_UNREAD", "HIDE_READ_FEEDS", "REVERSE_HEADLINES" */

View File

@@ -544,9 +544,8 @@ class RPC extends Handler_Protected {
function catchupFeed() {
$feed_id = db_escape_string($this->link, $_REQUEST['feed_id']);
$is_cat = db_escape_string($this->link, $_REQUEST['is_cat']) == "true";
$max_id = (int) db_escape_string($this->link, $_REQUEST['max_id']);
catchup_feed($this->link, $feed_id, $is_cat, false, $max_id);
catchup_feed($this->link, $feed_id, $is_cat, false);
print json_encode(array("message" => "UPDATE_COUNTERS"));
}