diff options
Diffstat (limited to 'classes')
| -rwxr-xr-x | classes/article.php | 6 | ||||
| -rwxr-xr-x | classes/feeds.php | 5 | ||||
| -rwxr-xr-x | classes/rssutils.php | 7 |
3 files changed, 12 insertions, 6 deletions
diff --git a/classes/article.php b/classes/article.php index 22f35b509..fd693a4fe 100755 --- a/classes/article.php +++ b/classes/article.php @@ -624,9 +624,9 @@ class Article extends Handler_Protected { $labels_str = ""; foreach ($labels as $l) { - $labels_str .= sprintf("<div1 class='label' - style='color : %s; background-color : %s'><i class='material-icons' style='color : %s'>label</i><div>%s</div></div1>", - $l[2], $l[3], $l[2], $l[1]); + $labels_str .= sprintf("<div class='label' + style='color : %s; background-color : %s'>%s</div>", + $l[2], $l[3], $l[1]); } return $labels_str; diff --git a/classes/feeds.php b/classes/feeds.php index 023fba81a..60ccdc2e7 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -209,6 +209,7 @@ class Feeds extends Handler_Protected { make_local_datetime($qfh_ret[4], false) : __("Never"); $highlight_words = $qfh_ret[5]; $reply['first_id'] = $qfh_ret[6]; + $reply['is_vfeed'] = $qfh_ret[7]; $reply['search_query'] = [$search, $search_language]; $reply['vfeed_group_enabled'] = $vfeed_group_enabled; @@ -1748,7 +1749,7 @@ class Feeds extends Handler_Protected { $first_id = (int)$row["id"]; if ($offset > 0 && $first_id && $check_first_id && $first_id != $check_first_id) { - return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id); + return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id, $vfeed_query_part != ""); } } } @@ -1837,7 +1838,7 @@ class Feeds extends Handler_Protected { $res = $pdo->query($query); } - return array($res, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id); + return array($res, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id, $vfeed_query_part != ""); } diff --git a/classes/rssutils.php b/classes/rssutils.php index a1ba95d66..6048c8310 100755 --- a/classes/rssutils.php +++ b/classes/rssutils.php @@ -1017,12 +1017,17 @@ class RSSUtils { SET score = ? WHERE 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); $sth = $pdo->prepare("UPDATE ttrss_user_entries SET last_read = null, unread = true WHERE ref_id = ?"); $sth->execute([$ref_id]); + } else { + Debug::log("article updated, but we're forbidden to mark it unread.", Debug::$LOG_VERBOSE); } } |