diff options
author | Andrew Dolgov <[email protected]> | 2012-09-10 10:27:51 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2012-09-10 10:27:51 +0400 |
commit | 46b781491b3837c5e0034eab7fbfea1cf1fc7de5 (patch) | |
tree | bf9c3d69d609dc5394cd22a84d1f46156530b809 /include | |
parent | 8cdc185ba4750dde98e4ea83174e30091e635506 (diff) |
set last_read to NOW() when publishing, order published feed by last read by default, allow overriding order in recently read feed
Diffstat (limited to 'include')
-rw-r--r-- | include/functions.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/functions.php b/include/functions.php index 65b794dd8..729cb2625 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2412,6 +2412,8 @@ $query_strategy_part = "published = true"; $vfeed_query_part = "ttrss_feeds.title AS feed_title,"; $allow_archived = true; + + if (!$override_order) $override_order = "last_read DESC, updated DESC"; } else { $vfeed_query_part = "ttrss_feeds.title AS feed_title,"; @@ -2424,7 +2426,8 @@ } else if ($feed == -6) { // recently read $query_strategy_part = "unread = false AND last_read IS NOT NULL"; $vfeed_query_part = "ttrss_feeds.title AS feed_title,"; - $override_order = "last_read DESC"; + + if (!$override_order) $override_order = "last_read DESC"; } else if ($feed == -3) { // fresh virtual feed $query_strategy_part = "unread = true AND score >= 0"; @@ -2997,7 +3000,7 @@ WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]); } else if ($cmode == 1) { db_query($link, "UPDATE ttrss_user_entries SET - published = true + published = true,last_read = NOW() WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]); } else { db_query($link, "UPDATE ttrss_user_entries SET |