public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-24 11:41:27 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into tunable-fetches

Browse Source 
Conflicts:
	include/rssfuncs.php
This commit is contained in:
Barak Korren
2013-04-01 16:05:48 +03:00
parent 83dff597ce 8401101d50
commit 32b7a340ad
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/rssfuncs.php
View File

@@ -286,7 +286,8 @@
$force_refetch = isset($_REQUEST["force_refetch"]);
$feed_data = fetch_file_contents($fetch_url, false,
$auth_login, $auth_pass, false, $no_cache ? 15 : 45,
$auth_login, $auth_pass, false,
$no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
$force_refetch ? 0 : max($last_updated_timestamp, $cache_timestamp));
if ($debug_enabled) {