From 77f39d65b5dd1661f8102b75746c13403d4195c2 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 20 Feb 2022 11:04:15 +0300 Subject: * Feeds::_get_counters - fix retrieving unread for tags * mark several symbols as @deprecated properly * replace uses of (deprecated) getFeedUnread() with Feeds::_get_counters() --- classes/feeds.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'classes/feeds.php') diff --git a/classes/feeds.php b/classes/feeds.php index cc78b498c..4f30ad746 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -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); -- cgit v1.2.3