From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 30 Mar 2013 11:42:27 +0000 (+0400)
Subject: update_rss_feed: bailout if cache is considered valid, but older than last_updated
X-Git-Tag: 1.7.6~132
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=17e74b21cf7dcb6d57c44b3cbf5e4c330f5f2c17;p=tt-rss.git

update_rss_feed: bailout if cache is considered valid, but older than last_updated
---

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index e2b6f57f..49d9e600 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -251,11 +251,18 @@
 					_debug("update_rss_feed: using local cache.");
 				}
 
-				@$rss_data = file_get_contents($cache_filename);
+				if ($cache_timestamp > $last_updated_timestamp) {
+					@$rss_data = file_get_contents($cache_filename);
 
-				if ($rss_data) {
-					$rss_hash = sha1($rss_data);
-					@$rss = unserialize($rss_data);
+					if ($rss_data) {
+						$rss_hash = sha1($rss_data);
+						@$rss = unserialize($rss_data);
+					}
+				} else {
+					if ($debug_enabled) {
+						_debug("update_rss_feed: local cache valid and older than last_updated, nothing to do.");
+					}
+					return;
 				}
 		}