diff options
| author | Andrew Dolgov <[email protected]> | 2013-03-28 20:51:06 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-03-28 20:51:06 +0400 |
| commit | 8aa01d7989807057b2bcac8916c0d1bc627268a8 (patch) | |
| tree | 6550047facc0bc94ea30fefe4a4accba54ab8311 | |
| parent | b9a06a0e39739b1d810bbb78bc1eef05f7d095cf (diff) | |
disable SORT_HEADLINES_BY_FEED_DATE; replace with a toolbar newest first order
| -rw-r--r-- | classes/feeds.php | 11 | ||||
| -rw-r--r-- | classes/handler/public.php | 8 | ||||
| -rw-r--r-- | classes/pref/prefs.php | 3 | ||||
| -rw-r--r-- | index.php | 1 |
4 files changed, 9 insertions, 14 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 6aca206a2..fcac6e4d6 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -862,15 +862,12 @@ class Feeds extends Handler_Protected { $override_order = false; - if (get_pref($this->link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) { - $date_sort_field = "updated"; - } else { - $date_sort_field = "date_entered"; - } - switch ($order_by) { case "date_reverse": - $override_order = "$date_sort_field, updated"; + $override_order = "date_entered DESC, updated"; + break; + case "feed_dates": + $override_order = "updated DESC"; break; } diff --git a/classes/handler/public.php b/classes/handler/public.php index 5adb3ab6e..32e40657d 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -14,11 +14,7 @@ class Handler_Public extends Handler { if (!$limit) $limit = 100; - if (get_pref($this->link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) { - $date_sort_field = "updated"; - } else { - $date_sort_field = "date_entered"; - } + $date_sort_field = "date_entered DESC, updated DESC"; if ($feed == -2) $date_sort_field = "last_published"; @@ -27,7 +23,7 @@ class Handler_Public extends Handler { $qfh_ret = queryFeedHeadlines($this->link, $feed, $limit, $view_mode, $is_cat, $search, $search_mode, - "$date_sort_field DESC", $offset, $owner_uid, + $date_sort_field, $offset, $owner_uid, false, 0, false, true); $result = $qfh_ret[0]; diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index be8b94447..ad5dff4ad 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -121,7 +121,8 @@ class Pref_Prefs extends Handler_Protected { global $access_level_names; - $prefs_blacklist = array("STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES"); + $prefs_blacklist = array("STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES", + "SORT_HEADLINES_BY_FEED_DATE"); /* "FEEDS_SORT_BY_UNREAD", "HIDE_READ_FEEDS", "REVERSE_HEADLINES" */ @@ -178,6 +178,7 @@ dojoType="dijit.form.Select" name="order_by"> <option selected="selected" value="default"><?php echo __('Default') ?></option> <option value="date_reverse"><?php echo __('Oldest first') ?></option> + <option value="feed_dates"><?php echo __('Newest first') ?></option> </select> <!-- deprecated --> |