diff options
| author | Barak Korren <[email protected]> | 2013-04-01 16:05:48 +0300 |
|---|---|---|
| committer | Barak Korren <[email protected]> | 2013-04-01 16:05:48 +0300 |
| commit | 32b7a340adb9c1acd209049512c0b5d53ed04276 (patch) | |
| tree | ee606f7c734a0f6403d2fd0dda9d0a8ee6c6b8a9 /include/rssfuncs.php | |
| parent | 83dff597ce2c4fa0c303b83c369392c4eb19bafa (diff) | |
| parent | 8401101d5051c4ccad140fc4b062fa9c780d06d9 (diff) | |
Merge branch 'master' into tunable-fetches
Conflicts:
include/rssfuncs.php
Diffstat (limited to 'include/rssfuncs.php')
| -rw-r--r-- | include/rssfuncs.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/rssfuncs.php b/include/rssfuncs.php index e3b1e44b2..ce197156c 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -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) { |