use getCategoryUnread in outputFeedList, misc fixes
This commit is contained in:
parent
318260cc8a
commit
26eb0119a5
2 changed files with 4 additions and 23 deletions
16
backend.php
16
backend.php
|
@ -364,22 +364,10 @@
|
|||
$ellipsis = "";
|
||||
}
|
||||
|
||||
if ($cat_id) {
|
||||
$cat_id_qpart = "cat_id = '$cat_id'";
|
||||
} else {
|
||||
$cat_id_qpart = "cat_id IS NULL";
|
||||
}
|
||||
|
||||
$tmp_result = db_query($link, "SELECT count(int_id) AS unread
|
||||
FROM ttrss_user_entries,ttrss_feeds WHERE
|
||||
unread = true AND
|
||||
feed_id = ttrss_feeds.id AND $cat_id_qpart AND
|
||||
ttrss_user_entries.owner_uid = " . $_SESSION["uid"]);
|
||||
|
||||
$cat_unread = db_fetch_result($tmp_result, 0, "unread");
|
||||
|
||||
$cat_id = sprintf("%d", $cat_id);
|
||||
|
||||
$cat_unread = getCategoryUnread($link, $cat_id);
|
||||
|
||||
print "<li class=\"feedCat\" id=\"FCAT-$cat_id\">
|
||||
<a id=\"FCATN-$cat_id\" href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a>
|
||||
<a href=\"javascript:viewCategory($cat_id)\" id=\"FCAP-$cat_id\">
|
||||
|
|
|
@ -204,15 +204,8 @@
|
|||
$cat_id_qpart = "cat_id IS NULL";
|
||||
}
|
||||
|
||||
$tmp_result = db_query($link, "SELECT count(int_id) AS unread
|
||||
FROM ttrss_user_entries,ttrss_feeds WHERE
|
||||
unread = true AND
|
||||
feed_id = ttrss_feeds.id AND $cat_id_qpart AND
|
||||
ttrss_user_entries.owner_uid = " . $_SESSION["uid"]);
|
||||
|
||||
$cat_unread = db_fetch_result($tmp_result, 0, "unread");
|
||||
|
||||
$cat_id = sprintf("%d", $cat_id);
|
||||
$cat_unread = getCategoryUnread($link, $cat_id);
|
||||
|
||||
print "<li class=\"feedCat\">
|
||||
<a href=\"?subop=tc&id=$cat_id\">$tmp_category</a>
|
||||
|
|
Loading…
Reference in a new issue