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 e2b6f57f8cf3c43730ffd541b58e7e538d289d3f..49d9e6009c448a8ab7d7e33281602b37df9a701c 100644 (file)
--- 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;
                                }
                }