public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-02-10 16:01:33 +00:00
Code Issues Releases Wiki Activity

unify child category counter display; remove include_children control

Browse Source
This commit is contained in:
Andrew Dolgov
2012-10-11 12:46:33 +04:00
parent daf0b0142d
commit 0ef32f48b2
6 changed files with 4 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
classes/feeds.php
View File

@@ -763,7 +763,6 @@ class Feeds extends Handler_Protected {
@$offset = db_escape_string($_REQUEST["skip"]);
@$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]);
$order_by = db_escape_string($_REQUEST["order_by"]);
$include_children = $_REQUEST["include_children"] == "true";
if (is_numeric($feed)) $feed = (int) $feed;
@@ -804,7 +803,6 @@ class Feeds extends Handler_Protected {
set_pref($this->link, "_DEFAULT_VIEW_MODE", $view_mode);
set_pref($this->link, "_DEFAULT_VIEW_LIMIT", $limit);
set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by);
set_pref($this->link, "_DEFAULT_INCLUDE_CHILDREN", $include_children);
if (!$cat_view && is_numeric($feed) && $feed > 0) {
db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW()
@@ -858,7 +856,7 @@ class Feeds extends Handler_Protected {
$ret = $this->format_headlines_list($feed, $method,
$view_mode, $limit, $cat_view, $next_unread_feed, $offset,
$vgroup_last_feed, $override_order, $include_children);
$vgroup_last_feed, $override_order, true);
$topmost_article_ids = $ret[0];
$headlines_count = $ret[1];