From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Nov 2010 19:59:05 +0000 (+0300)
Subject: disable resort_feedlist; misc fixes in plain feedlist
X-Git-Tag: 1.5.0~214
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=ac4bedc341b71a698d1f63ae928f839fc4b9643e;p=tt-rss.git

disable resort_feedlist; misc fixes in plain feedlist
---

diff --git a/feedlist.js b/feedlist.js
index 5b3476e4..f906c37e 100644
--- 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 bf9c7264..94cb9ced 100644
--- 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";