diff options
| author | Andrew Dolgov <[email protected]> | 2012-05-05 22:28:46 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-05-05 22:28:46 +0400 |
| commit | 941e48a402e084a3fa51224b150dc186250650e1 (patch) | |
| tree | e5914ddc6824e00ae793e8efc4c3886e5685d6e0 /include | |
| parent | dd205fbad642ace6d0e33c8553f7d73404f140b4 (diff) | |
apply patch from gmargo to differentiate between manual and new feed after-subscription update
Diffstat (limited to 'include')
| -rw-r--r-- | include/rssfuncs.php | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 9ffe7a463..48a246d88 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -81,7 +81,8 @@ ) OR ( ttrss_feeds.update_interval > 0 AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL) - ) OR ttrss_feeds.last_updated IS NULL)"; + ) OR ttrss_feeds.last_updated IS NULL + OR last_updated = '1970-01-01 00:00:00')"; } else { $update_limit_qpart = "AND (( ttrss_feeds.update_interval = 0 @@ -89,7 +90,8 @@ ) OR ( ttrss_feeds.update_interval > 0 AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE) - ) OR ttrss_feeds.last_updated IS NULL)"; + ) OR ttrss_feeds.last_updated IS NULL + OR last_updated = '1970-01-01 00:00:00')"; } // Test if feed is currently being updated by another process. @@ -344,12 +346,15 @@ } else { + // Ignore cache if new feed or manual update. + $cache_age = (is_null($last_updated) || $last_updated == '1970-01-01 00:00:00') ? + -1 : get_feed_update_interval($link, $feed) * 60; + if ($update_method == 3) { $rss = fetch_twitter_rss($link, $fetch_url, $owner_uid); } else if ($update_method == 1) { - // Ignore cache if manual update. - define('MAGPIE_CACHE_AGE', is_null($last_updated) ? -1 : get_feed_update_interval($link, $feed) * 60); + define('MAGPIE_CACHE_AGE', $cache_age); define('MAGPIE_CACHE_ON', !$no_cache); define('MAGPIE_FETCH_TIME_OUT', 60); define('MAGPIE_CACHE_DIR', CACHE_DIR . "/magpie"); @@ -377,9 +382,8 @@ $rss->enable_cache(!$no_cache); if (!$no_cache) { - // Ignore cache if manual update. $rss->set_cache_location($simplepie_cache_dir); - $rss->set_cache_duration(is_null($last_updated) ? -1 : get_feed_update_interval($link, $feed) * 60); + $rss->set_cache_duration($cache_age); } $rss->init(); |