unify child category counter display; remove include_children control

[tt-rss.git] / classes / feeds.php

diff --git a/classes/feeds.php b/classes/feeds.php
index ad9f297fc1772f23e0c6d09b6ef46ba57642143e..31224d1db3b6579e3c547441c8bf020fce7e159d 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -763,7 +763,6 @@ class Feeds extends Handler_Protected {
                @$offset = db_escape_string($_REQUEST["skip"]);\r
                @$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]);\r
                $order_by = db_escape_string($_REQUEST["order_by"]);\r
-               $include_children = $_REQUEST["include_children"] == "true";\r
 \r
                if (is_numeric($feed)) $feed = (int) $feed;\r
 \r
@@ -804,7 +803,6 @@ class Feeds extends Handler_Protected {
                set_pref($this->link, "_DEFAULT_VIEW_MODE", $view_mode);\r
                set_pref($this->link, "_DEFAULT_VIEW_LIMIT", $limit);\r
                set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by);\r
-               set_pref($this->link, "_DEFAULT_INCLUDE_CHILDREN", $include_children);\r
 \r
                if (!$cat_view && is_numeric($feed) && $feed > 0) {\r
                        db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW()\r
@@ -858,7 +856,7 @@ class Feeds extends Handler_Protected {
 \r
                $ret = $this->format_headlines_list($feed, $method,\r
                        $view_mode, $limit, $cat_view, $next_unread_feed, $offset,\r
-                       $vgroup_last_feed, $override_order, $include_children);\r
+                       $vgroup_last_feed, $override_order, true);\r
 \r
                $topmost_article_ids = $ret[0];\r
                $headlines_count = $ret[1];\r