mirrors/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/fox/tt-rss.git synced 2025-10-11 19:11:04 +02:00
Code Issues Projects Releases Wiki Activity

revert to previous adaptive behavior

Browse Source
This commit is contained in:
Andrew Dolgov 2013-03-25 22:41:22 +04:00
parent aa0f6414aa
commit a6adb136fd
1 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/functions.php
View File

@ -2237,40 +2237,14 @@
$view_query_part = " "; $view_query_part = " ";
} else if ($feed != -1) { } else if ($feed != -1) {
if (defined('_CLASSIC_ADAPTIVE')) { $unread = getFeedUnread($link, $feed, $cat_view);
$unread = getFeedUnread($link, $feed, $cat_view); if ($cat_view && $feed > 0 && $include_children)
$unread += getCategoryChildrenUnread($link, $feed);
if ($cat_view && $feed > 0 && $include_children) if ($unread > 0)
$unread += getCategoryChildrenUnread($link, $feed); $view_query_part = " unread = true AND ";
if ($unread > 0)
$view_query_part = " unread = true AND ";
} else {
if (get_pref($link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
$a_date_sort_field = "updated";
} else {
$a_date_sort_field = "date_entered";
}
if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
$a_order_by = "$a_date_sort_field";
} else {
$a_order_by = "$a_date_sort_field DESC";
}
if (!$override_order) {
$override_order = "unread DESC, $a_order_by";
}
if (!$ignore_vfeed_group && ($is_cat || $feed_id < 0) &&
get_pref($link, 'VFEED_GROUP_BY_FEED', $owner_uid)) {
$override_order = "ttrss_feeds.title, $override_order";
}
}
} }
} }