From 11232703615a58fca38e37498ee75b69fff5ca47 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 5 Nov 2010 16:32:52 +0300 Subject: api: fix getFeeds usage of getLabelCounters --- functions.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/functions.php b/functions.php index a45d69485..caa95e628 100644 --- a/functions.php +++ b/functions.php @@ -2822,7 +2822,7 @@ return $ret_arr; } - function getLabelCounters($link) { + function getLabelCounters($link, $descriptions = false) { $ret_arr = array(); @@ -2841,8 +2841,10 @@ $count = getFeedUnread($link, $id); $cv = array("id" => $id, - "counter" => $count, - "description" => $label_name); + "counter" => $count); + + if ($descriptions) + $cv["description"] = $label_name; if (get_pref($link, 'EXTENDED_FEEDLIST')) $cv["xmsg"] = getFeedArticles($link, $id)." ".__("total"); @@ -6662,16 +6664,16 @@ if ($cat_id == -4 || $cat_id == -2) { $counters = getLabelCounters($link, true); - foreach (array_keys($counters) as $id) { + foreach (array_values($counters) as $cv) { - $unread = $counters[$id]["counter"]; + $unread = $cv["counter"]; if ($unread || !$unread_only) { $row = array( - "id" => $id, - "title" => $counters[$id]["description"], - "unread" => $counters[$id]["counter"], + "id" => $cv["id"], + "title" => $cv["description"], + "unread" => $cv["counter"], "cat_id" => -2, ); -- cgit v1.2.3