valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update_rss_feed: mark_unread_on_update should take into account catchup filter action and entry_force_catchup

This commit is contained in:
Andrew Dolgov 2019-02-06 22:56:14 +03:00
parent dd9bad06ee
commit 13e7e775a3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
classes/rssutils.php
View File

@ -1017,12 +1017,17 @@ class RSSUtils {
SET score = ? WHERE ref_id = ?"); SET score = ? WHERE ref_id = ?");
$sth->execute([$score, $ref_id]); $sth->execute([$score, $ref_id]);
if ($mark_unread_on_update) { if ($mark_unread_on_update &&
!$entry_force_catchup &&
!RSSUtils::find_article_filter($article_filters, 'catchup')) {
Debug::log("article updated, marking unread as requested.", Debug::$LOG_VERBOSE); Debug::log("article updated, marking unread as requested.", Debug::$LOG_VERBOSE);
$sth = $pdo->prepare("UPDATE ttrss_user_entries $sth = $pdo->prepare("UPDATE ttrss_user_entries
SET last_read = null, unread = true WHERE ref_id = ?"); SET last_read = null, unread = true WHERE ref_id = ?");
$sth->execute([$ref_id]); $sth->execute([$ref_id]);
} else {
Debug::log("article updated, but we're forbidden to mark it unread.", Debug::$LOG_VERBOSE);
} }
} }