disable resort_feedlist; misc fixes in plain feedlist

diff --git a/feedlist.js b/feedlist.js
index 5b3476e4cde0386bcb3c7b594662489895fc8853..f906c37ed367f8a34f548589cc52f5621830e142 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -612,6 +612,8 @@ function resort_category(node, cat_mode) {
 }
 
 function resort_feedlist() {
+       return;
+
        console.log("resort_feedlist");
 
        if ($("FCATLIST--1")) {

diff --git a/functions.php b/functions.php
index bf9c726413b1de032910c8900ddba15e7a493d95..94cb9ced90f4650916206cfade4220e18e287384 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -4384,13 +4384,11 @@
                        $result = db_query($link, "SELECT * FROM
                                ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption");
                
-                       if (db_num_rows($result) > 0) {
-                               if (get_pref($link, 'ENABLE_FEED_CATS')) {
-                                       $cat_hidden = get_pref($link, "_COLLAPSED_LABELS");
-                                       $cat = feedlist_init_cat($link, -2, $cat_hidden);
-                               } else {
-                                       $cat['items'] = array();
-                               }
+                       if (get_pref($link, 'ENABLE_FEED_CATS')) {
+                               $cat_hidden = get_pref($link, "_COLLAPSED_LABELS");
+                               $cat = feedlist_init_cat($link, -2, $cat_hidden);
+                       } else {
+                               $cat['items'] = array();
                        }
        
                        while ($line = db_fetch_assoc($result)) {
@@ -4407,7 +4405,7 @@
                        } else {
                                $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
                        }
-
+               
                        if (get_pref($link, 'ENABLE_FEED_CATS')) {
                                if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
                                        $order_by_qpart = "order_id,category,unread DESC,title";