revert to previous adaptive behavior

diff --git a/include/functions.php b/include/functions.php
index 93fa7cc0ea7eafa166d3d35adcb3bc0c5e2573f8..fd92348bed72b3a9e15855a5123cab5a93fadb08 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -2237,40 +2237,14 @@
                                        $view_query_part = " ";
                                } 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)
-                                                       $unread += getCategoryChildrenUnread($link, $feed);
+                                       if ($unread > 0)
+                               $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";
-                                               }
-                                       }
                                }
                        }