Merge branch 'master' into tunable-fetches

Conflicts:
	include/rssfuncs.php

diff --cc include/functions.php
Simple merge

diff --cc include/rssfuncs.php
index e3b1e44b21649040b3a9bdb0e5cf4bc1eb888a1c,5c37b7523d33447d389b16d71724e952526927de..ce197156c4603110d4c6c8d92f629fd16c5004ee
--- 1/include/rssfuncs.php
--- 2/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@@ -283,11 -283,10 +283,12 @@@
                                        _debug("update_rss_feed: fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)");
                                }
  
 +                              $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,
 -                                      max($last_updated_timestamp, $cache_timestamp));
 +                                      $force_refetch ? 0 : max($last_updated_timestamp, $cache_timestamp));
  
                                if ($debug_enabled) {
                                        _debug("update_rss_feed: fetch done.");