summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/ccache.php4
-rw-r--r--include/rssfuncs.php4
2 files changed, 6 insertions, 2 deletions
diff --git a/include/ccache.php b/include/ccache.php
index d89b9efe0..c33165ef8 100644
--- a/include/ccache.php
+++ b/include/ccache.php
@@ -127,12 +127,12 @@
/* Recalculate counters for child feeds */
- $result = db_query("SELECT id FROM ttrss_feeds
+ /* $result = db_query("SELECT id FROM ttrss_feeds
WHERE owner_uid = '$owner_uid' AND $cat_qpart");
while ($line = db_fetch_assoc($result)) {
ccache_update($line["id"], $owner_uid, false, false);
- }
+ } */
$result = db_query("SELECT SUM(value) AS sv
FROM ttrss_counters_cache, ttrss_feeds
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index a5d3898ce..08bf1fe6d 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -212,6 +212,10 @@
return false;
}
+ // set last update to now so if anything *simplepie* crashes later we won't be
+ // continuously failing on the same feed
+ db_query("UPDATE ttrss_feeds SET last_updated = NOW() WHERE id = '$feed'");
+
$last_updated = db_fetch_result($result, 0, "last_updated");
$last_article_timestamp = @strtotime(db_fetch_result($result, 0, "last_article_timestamp"));
$owner_uid = db_fetch_result($result, 0, "owner_uid");