public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 04:55:54 +00:00
Code Issues Releases Wiki Activity

* Feeds::_get_counters - fix retrieving unread for tags

Browse Source 
* mark several symbols as @deprecated properly
 * replace uses of (deprecated) getFeedUnread() with Feeds::_get_counters()
This commit is contained in:
Andrew Dolgov
2022-02-20 11:04:15 +03:00
parent 168dc6fe57
commit 77f39d65b5
5 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
classes/feeds.php
View File

@@ -936,7 +936,15 @@ class Feeds extends Handler_Protected {
}
}
static function _get_counters(int $feed, bool $is_cat = false, bool $unread_only = false, ?int $owner_uid = null): int {
/**
* @param int|string $feed feed id or tag name
* @param bool $is_cat
* @param bool $unread_only
* @param null|int $owner_uid
* @return int
* @throws PDOException
*/
static function _get_counters($feed, bool $is_cat = false, bool $unread_only = false, ?int $owner_uid = null): int {
$n_feed = (int) $feed;
$need_entries = false;
@@ -957,6 +965,7 @@ class Feeds extends Handler_Protected {
return self::_get_cat_unread($n_feed, $owner_uid);
} else if ($n_feed == -6) {
return 0;
// tags
} else if ($feed != "0" && $n_feed == 0) {
$sth = $pdo->prepare("SELECT SUM((SELECT COUNT(int_id)
@@ -1498,7 +1507,7 @@ class Feeds extends Handler_Protected {
$view_query_part = " ";
} else if ($feed != -1) {
$unread = getFeedUnread($feed, $cat_view);
$unread = Feeds::_get_counters($feed, $cat_view);
if ($cat_view && $feed > 0 && $include_children)
$unread += self::_get_cat_children_unread($feed);