From 09101297ee0596a6c66d9c7388795e8602c24113 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Aug 2012 21:25:46 +0400 Subject: add toolbar checkbox to include subcategories to viewfeed() --- include/functions.php | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'include/functions.php') diff --git a/include/functions.php b/include/functions.php index 1116e422c..3cb503fd8 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2287,7 +2287,7 @@ return $rv; } - function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0) { + function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; @@ -2332,7 +2332,7 @@ } else if ($feed != -1) { $unread = getFeedUnread($link, $feed, $cat_view); - if ($cat_view && $feed > 0) + if ($cat_view && $feed > 0 && $include_children) $unread += getCategoryChildrenUnread($link, $feed); if ($unread > 0) { @@ -2406,15 +2406,19 @@ if ($cat_view) { if ($feed > 0) { - # sub-cats - $subcats = getChildCategories($link, $feed, $owner_uid); - - if (count($subcats) == 0) { - $query_strategy_part = "cat_id = '$feed'"; + if ($include_children) { + # sub-cats + $subcats = getChildCategories($link, $feed, $owner_uid); + + if (count($subcats) == 0) { + $query_strategy_part = "cat_id = '$feed'"; + } else { + array_push($subcats, $feed); + $query_strategy_part = "cat_id IN (". + implode(",", $subcats).")"; + } } else { - array_push($subcats, $feed); - $query_strategy_part = "cat_id IN (". - implode(",", $subcats).")"; + $query_strategy_part = "cat_id = '$feed'"; } } else { -- cgit v1.2.3