unify child category counter display; remove include_children control

[tt-rss.git] / include / functions.php

diff --git a/include/functions.php b/include/functions.php
index 446e474a4b8c92ba11b0e858225e4f858be61e10..c03fd9975b92025801889849c85baf041feaa464 100644 (file)
--- 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");