feedlist: do not show labels folder when there are no labels

This commit is contained in:
Andrew Dolgov 2010-11-21 20:54:25 +03:00
parent dbf8845e3b
commit d4f46bc1fd
1 changed files with 25 additions and 22 deletions

View File

@ -4221,6 +4221,8 @@
$result = db_query($link, "SELECT * FROM $result = db_query($link, "SELECT * FROM
ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption"); ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption");
if (db_num_rows($result) > 0) {
if (get_pref($link, 'ENABLE_FEED_CATS')) { if (get_pref($link, 'ENABLE_FEED_CATS')) {
$cat_hidden = get_pref($link, "_COLLAPSED_LABELS"); $cat_hidden = get_pref($link, "_COLLAPSED_LABELS");
$cat = feedlist_init_cat($link, -2, $cat_hidden); $cat = feedlist_init_cat($link, -2, $cat_hidden);
@ -4247,6 +4249,7 @@
$feedlist['items'] = array_merge($feedlist['items'], $cat['items']); $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
} }
} }
}
/* if (get_pref($link, 'ENABLE_FEED_CATS')) { /* if (get_pref($link, 'ENABLE_FEED_CATS')) {
if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) { if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {