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

don't rely only on label_cache contents when displaying headline labels

This commit is contained in:
Andrew Dolgov 2021-02-27 10:58:11 +03:00
parent 126b1fd2de
commit 6d06450649
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
classes/feeds.php
View File

@ -200,17 +200,21 @@ class Feeds extends Handler_Protected {
$feed_id = $line["feed_id"]; $feed_id = $line["feed_id"];
$label_cache = $line["label_cache"]; if ($line["num_labels"] > 0) {
$labels = false; $label_cache = $line["label_cache"];
$labels = false;
if ($label_cache) {
$label_cache = json_decode($label_cache, true);
if ($label_cache) { if ($label_cache) {
if ($label_cache["no-labels"] ?? false == 1) $label_cache = json_decode($label_cache, true);
$labels = [];
else if ($label_cache) {
$labels = $label_cache; if ($label_cache["no-labels"] ?? 0 == 1)
$labels = [];
else
$labels = $label_cache;
}
} else {
$labels = Article::_get_labels($id);
} }
$line["labels"] = $labels; $line["labels"] = $labels;
@ -218,10 +222,6 @@ class Feeds extends Handler_Protected {
$line["labels"] = []; $line["labels"] = [];
} }
/*if (!is_array($labels)) $labels = Article::_get_labels($id);
$line["labels"] = Article::_get_labels($id);*/
if (count($topmost_article_ids) < 3) { if (count($topmost_article_ids) < 3) {
array_push($topmost_article_ids, $id); array_push($topmost_article_ids, $id);
} }
@ -1695,6 +1695,7 @@ class Feeds extends Handler_Protected {
$vfeed_query_part $vfeed_query_part
$content_query_part $content_query_part
author,score, author,score,
(SELECT count(label_id) FROM ttrss_user_labels2 WHERE article_id = ttrss_entries.id) AS num_labels,
(SELECT count(id) FROM ttrss_enclosures WHERE post_id = ttrss_entries.id) AS num_enclosures (SELECT count(id) FROM ttrss_enclosures WHERE post_id = ttrss_entries.id) AS num_enclosures
FROM FROM
$from_qpart $from_qpart
@ -1754,6 +1755,7 @@ class Feeds extends Handler_Protected {
$vfeed_query_part $vfeed_query_part
$content_query_part $content_query_part
author, score, author, score,
(SELECT count(label_id) FROM ttrss_user_labels2 WHERE article_id = ttrss_entries.id) AS num_labels,
(SELECT count(id) FROM ttrss_enclosures WHERE post_id = ttrss_entries.id) AS num_enclosures (SELECT count(id) FROM ttrss_enclosures WHERE post_id = ttrss_entries.id) AS num_enclosures
FROM ttrss_entries, ttrss_user_entries, ttrss_tags, ttrss_feeds FROM ttrss_entries, ttrss_user_entries, ttrss_tags, ttrss_feeds
WHERE WHERE