Merge branch 'master' into tunable-fetches

[tt-rss.git] / include / rssfuncs.php

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index e3b1e44b21649040b3a9bdb0e5cf4bc1eb888a1c..ce197156c4603110d4c6c8d92f629fd16c5004ee 100644 (file)
--- 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) {