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

implement proper last_marked/last_published feeds for proper sorting of

Browse Source 
published and marked virtual feeds, remove sorting by last_read
workaround
api: add pubsubhubbub ping when article is being set published
bump schema
This commit is contained in:
Andrew Dolgov
2013-03-17 15:32:44 +04:00
parent f01c8ec4f1
commit 7873d58822
8 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/functions.php
View File

@@ -1,6 +1,6 @@
<?php
define('EXPECTED_CONFIG_VERSION', 26);
define('SCHEMA_VERSION', 104);
define('SCHEMA_VERSION', 105);
$fetch_last_error = false;
$pluginhost = false;
@@ -2310,6 +2310,8 @@
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
$allow_archived = true;
if (!$override_order) $override_order = "last_marked DESC, updated DESC";
} else if ($feed == -2) { // published virtual feed OR labels category
if (!$cat_view) {
@@ -2317,7 +2319,7 @@
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
$allow_archived = true;
if (!$override_order) $override_order = "last_read DESC, updated DESC";
if (!$override_order) $override_order = "last_published DESC, updated DESC";
} else {
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
@@ -2450,6 +2452,7 @@
comments,
int_id,
unread,feed_id,marked,published,link,last_read,orig_feed_id,
last_marked, last_published,
".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms,
$vfeed_query_part
$content_query_part
@@ -2492,6 +2495,7 @@
"label_cache," .
"link," .
"last_read," .
"last_marked, last_published, " .
SUBSTRING_FOR_DATE . "(last_read,1,19) as last_read_noms," .
$since_id_part .
$vfeed_query_part .