valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disable resort_feedlist; misc fixes in plain feedlist

This commit is contained in:
Andrew Dolgov 2010-11-15 22:59:05 +03:00
parent 0ce6115754
commit ac4bedc341
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
feedlist.js
View File

@ -612,6 +612,8 @@ function resort_category(node, cat_mode) {
} }
function resort_feedlist() { function resort_feedlist() {
return;
console.log("resort_feedlist"); console.log("resort_feedlist");
if ($("FCATLIST--1")) { if ($("FCATLIST--1")) {

14
functions.php
View File

@ -4384,13 +4384,11 @@
$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); } else {
} else { $cat['items'] = array();
$cat['items'] = array();
}
} }
while ($line = db_fetch_assoc($result)) { while ($line = db_fetch_assoc($result)) {
@ -4407,7 +4405,7 @@
} else { } else {
$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")) {
$order_by_qpart = "order_id,category,unread DESC,title"; $order_by_qpart = "order_id,category,unread DESC,title";