summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2012-10-11 12:46:33 +0400
committerAndrew Dolgov <[email protected]>2012-10-11 12:46:33 +0400
commit0ef32f48b26f94b041977730bf00fe2750e4ad25 (patch)
tree037ae9142b7d42a5f7db5019d0aa1ef546b9a1bc /include
parentdaf0b0142dc264d784c5859ef6f370d9b3b21f13 (diff)
unify child category counter display; remove include_children control
Diffstat (limited to 'include')
-rw-r--r--include/functions.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/functions.php b/include/functions.php
index 446e474a4..c03fd9975 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1413,8 +1413,7 @@
}
$cv = array("id" => $line["cat_id"], "kind" => "cat",
- "child_counter" => $child_counter,
- "counter" => $line["unread"]);
+ "counter" => $line["unread"] + $child_counter);
array_push($ret_arr, $cv);
}
@@ -2124,7 +2123,6 @@
$params["icons_url"] = ICONS_URL;
$params["cookie_lifetime"] = SESSION_COOKIE_LIFETIME;
- $params["default_include_children"] = get_pref($link, "_DEFAULT_INCLUDE_CHILDREN");
$params["default_view_mode"] = get_pref($link, "_DEFAULT_VIEW_MODE");
$params["default_view_limit"] = (int) get_pref($link, "_DEFAULT_VIEW_LIMIT");
$params["default_view_order_by"] = get_pref($link, "_DEFAULT_VIEW_ORDER_BY");