diff options
| author | Andrew Dolgov <[email protected]> | 2013-03-28 20:44:43 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-03-28 20:44:43 +0400 |
| commit | b9a06a0e39739b1d810bbb78bc1eef05f7d095cf (patch) | |
| tree | 4459d9f95bb23562a54a4fafc5c030c26d7a5eeb /classes | |
| parent | 699e3cfc65174ba531401c2689f6b2074546bb34 (diff) | |
retire frankly ridiculous sorting by score/title/date/default
keep defaul and oldest first instead of REVERSE_HEADLINES
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/feeds.php | 24 | ||||
| -rw-r--r-- | classes/pref/prefs.php | 2 | ||||
| -rw-r--r-- | classes/rpc.php | 3 |
3 files changed, 4 insertions, 25 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 1086dc493..6aca206a2 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -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; } diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 3226ccde9..be8b94447 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -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" */ diff --git a/classes/rpc.php b/classes/rpc.php index 72028759e..66bdb86b0 100644 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -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")); } |