ccache category fixes; re-enable rate limit

This commit is contained in:
Andrew Dolgov 2009-01-16 16:33:26 +01:00
parent ea003fc2cd
commit f55b0b12aa
2 changed files with 6 additions and 13 deletions

View File

@ -623,17 +623,13 @@ function request_counters() {
// if (getInitParam("sync_counters") == "1" ||
// timestamp - counters_last_request > 10) {
/* if (timestamp - counters_last_request > 10) {
if (timestamp - counters_last_request > 5) {
debug("scheduling request of counters...");
window.setTimeout("request_counters_real()", 1000);
counters_last_request = timestamp;
} else {
debug("request_counters: rate limit reached: " + (timestamp - counters_last_request));
} */
window.setTimeout("request_counters_real()", 1000);
counters_last_request = timestamp;
}
} catch (e) {
exception_error("request_counters", e);

View File

@ -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