valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disable internal magpie/simplepie cache for manual updates

This commit is contained in:
Andrew Dolgov 2012-04-09 11:58:00 +04:00
parent de44b9a61e
commit 6cb2269c03
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/rssfuncs.php
View File

@ -254,7 +254,7 @@
} }
$result = db_query($link, "SELECT id,update_interval,auth_login, $result = db_query($link, "SELECT id,update_interval,auth_login,
auth_pass,cache_images,update_method auth_pass,cache_images,update_method,last_updated
FROM ttrss_feeds WHERE id = '$feed' AND $updstart_thresh_qpart"); FROM ttrss_feeds WHERE id = '$feed' AND $updstart_thresh_qpart");
} else { } else {
@ -348,7 +348,8 @@
$rss = fetch_twitter_rss($link, $fetch_url, $owner_uid); $rss = fetch_twitter_rss($link, $fetch_url, $owner_uid);
} else if ($update_method == 1) { } else if ($update_method == 1) {
define('MAGPIE_CACHE_AGE', get_feed_update_interval($link, $feed) * 60); // Ignore cache if manual update.
define('MAGPIE_CACHE_AGE', is_null($last_updated) ? -1 : get_feed_update_interval($link, $feed) * 60);
define('MAGPIE_CACHE_ON', !$no_cache); define('MAGPIE_CACHE_ON', !$no_cache);
define('MAGPIE_FETCH_TIME_OUT', 60); define('MAGPIE_FETCH_TIME_OUT', 60);
define('MAGPIE_CACHE_DIR', CACHE_DIR . "/magpie"); define('MAGPIE_CACHE_DIR', CACHE_DIR . "/magpie");
@ -376,8 +377,9 @@
$rss->enable_cache(!$no_cache); $rss->enable_cache(!$no_cache);
if (!$no_cache) { if (!$no_cache) {
// Ignore cache if manual update.
$rss->set_cache_location($simplepie_cache_dir); $rss->set_cache_location($simplepie_cache_dir);
$rss->set_cache_duration(get_feed_update_interval($link, $feed) * 60); $rss->set_cache_duration(is_null($last_updated) ? -1 : get_feed_update_interval($link, $feed) * 60);
} }
$rss->init(); $rss->init();