diff options
| author | Andrew Dolgov <[email protected]> | 2010-11-15 22:59:05 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2010-11-15 22:59:05 +0300 |
| commit | ac4bedc341b71a698d1f63ae928f839fc4b9643e (patch) | |
| tree | 9cfed83c4d9da89ac73a64907458d7b556bf49ca /functions.php | |
| parent | 0ce6115754fb20ea0a380b1d49235d23ba7c6d05 (diff) | |
disable resort_feedlist; misc fixes in plain feedlist
Diffstat (limited to 'functions.php')
| -rw-r--r-- | functions.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/functions.php b/functions.php index bf9c72641..94cb9ced9 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"; |