Merge branch 'master' of git.fakecake.org:fox/tt-rss
This commit is contained in:
commit
a125e8540d
|
@ -119,7 +119,7 @@ class Digest
|
||||||
link,
|
link,
|
||||||
score,
|
score,
|
||||||
content,
|
content,
|
||||||
" . SUBSTRING_FOR_DATE . "(last_updated,1,19) AS last_updated
|
".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
|
||||||
FROM
|
FROM
|
||||||
ttrss_user_entries,ttrss_entries,ttrss_feeds
|
ttrss_user_entries,ttrss_entries,ttrss_feeds
|
||||||
LEFT JOIN
|
LEFT JOIN
|
||||||
|
@ -132,8 +132,8 @@ class Digest
|
||||||
AND unread = true
|
AND unread = true
|
||||||
AND score >= 0
|
AND score >= 0
|
||||||
ORDER BY ttrss_feed_categories.title, ttrss_feeds.title, score DESC, date_updated DESC
|
ORDER BY ttrss_feed_categories.title, ttrss_feeds.title, score DESC, date_updated DESC
|
||||||
LIMIT :limit");
|
LIMIT " . (int)$limit);
|
||||||
$sth->execute([':user_id' => $user_id, ':limit' => $limit]);
|
$sth->execute([':user_id' => $user_id]);
|
||||||
|
|
||||||
$headlines_count = 0;
|
$headlines_count = 0;
|
||||||
$headlines = array();
|
$headlines = array();
|
||||||
|
|
Loading…
Reference in New Issue