blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix ccache_update() failure when called for labels

Browse source
This commit is contained in:
Andrew Dolgov 2009-01-17 18:23:12 +01:00
parent cd4cc9f6e4
commit 51e196dee9
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
backend.php
View file

@ -270,7 +270,12 @@
$csync = $_GET["csync"]; $csync = $_GET["csync"];
$order_by = db_escape_string($_GET["order_by"]); $order_by = db_escape_string($_GET["order_by"]);
/* Updating a label ccache means recalculating all of the caches
* so for performance reasons we don't do that here */
if ($feed >= 0) {
ccache_update($link, $feed, $_SESSION["uid"], $cat_view); ccache_update($link, $feed, $_SESSION["uid"], $cat_view);
}
set_pref($link, "_DEFAULT_VIEW_MODE", $view_mode); set_pref($link, "_DEFAULT_VIEW_MODE", $view_mode);
set_pref($link, "_DEFAULT_VIEW_LIMIT", $limit); set_pref($link, "_DEFAULT_VIEW_LIMIT", $limit);

4
functions.php
View file

@ -5938,7 +5938,6 @@
ccache_update($link, 0, $owner_uid, true); ccache_update($link, 0, $owner_uid, true);
} else { } else {
$result = db_query($link, "SELECT feed_id FROM ttrss_counters_cache $result = db_query($link, "SELECT feed_id FROM ttrss_counters_cache
WHERE feed_id > 0 AND owner_uid = '$owner_uid'"); WHERE feed_id > 0 AND owner_uid = '$owner_uid'");
@ -6022,7 +6021,7 @@
WHERE id = feed_id AND $cat_qpart AND WHERE id = feed_id AND $cat_qpart AND
ttrss_feeds.owner_uid = '$owner_uid'"); ttrss_feeds.owner_uid = '$owner_uid'");
$unread = db_fetch_result($result, 0, "sv"); $unread = (int) db_fetch_result($result, 0, "sv");
} else { } else {
$unread = (int) getFeedArticles($link, $feed_id, $is_cat, true, $owner_uid); $unread = (int) getFeedArticles($link, $feed_id, $is_cat, true, $owner_uid);
@ -6041,7 +6040,6 @@
(feed_id, value, owner_uid, updated) (feed_id, value, owner_uid, updated)
VALUES VALUES
($feed_id, $unread, $owner_uid, NOW())"); ($feed_id, $unread, $owner_uid, NOW())");
} }
if ($feed_id > 0 && $prev_unread != $unread) { if ($feed_id > 0 && $prev_unread != $unread) {