diff options
| author | Andrew Dolgov <[email protected]> | 2009-01-16 16:33:26 +0100 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2009-01-16 16:33:26 +0100 |
| commit | f55b0b12aa7961b4dcb52041963cd35d8fc0da53 (patch) | |
| tree | 132313899cedb7059730b73f109c28dce91c2ae1 /functions.php | |
| parent | ea003fc2cdce998e897ea5a4bc23526a7a12af3d (diff) | |
ccache category fixes; re-enable rate limit
Diffstat (limited to 'functions.php')
| -rw-r--r-- | functions.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/functions.php b/functions.php index ce0360c89..53ad3ce70 100644 --- a/functions.php +++ b/functions.php @@ -4208,7 +4208,7 @@ function printCategoryHeader($link, $cat_id, $hidden = false, $can_browse = true) { $tmp_category = getCategoryTitle($link, $cat_id); - $cat_unread = getCategoryUnread($link, $cat_id); + $cat_unread = ccache_find($link, $cat_id, $_SESSION["uid"], true); if ($hidden) { $holder_style = "display:none;"; @@ -6058,12 +6058,7 @@ $table = "ttrss_cat_counters_cache"; } - if (!$is_cat) { - - $unread = (int) getFeedArticles($link, $feed_id, $is_cat, true, $owner_uid); - - } else { - + if ($is_cat && $feed_id > 0) { if ($feed_id != 0) { $cat_qpart = "cat_id = '$feed_id'"; } else { @@ -6077,6 +6072,8 @@ $unread = db_fetch_result($result, 0, "sv"); + } else { + $unread = (int) getFeedArticles($link, $feed_id, $is_cat, true, $owner_uid); } $result = db_query($link, "SELECT feed_id FROM $table |