From c0c2abbaa73363a1349e41ec08cd54a0d1e8ad8e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 25 Oct 2012 13:15:14 +0400
Subject: force refetch feed when clicking update/clicking on same feed in the
 tree

---
 include/rssfuncs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/rssfuncs.php')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 09fd457b6..14fa5f348 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -269,7 +269,7 @@
 
 			define('MAGPIE_CACHE_AGE', $cache_age);
 			define('MAGPIE_CACHE_ON', !$no_cache);
-			define('MAGPIE_FETCH_TIME_OUT', 60);
+			define('MAGPIE_FETCH_TIME_OUT', $no_cache ? 15 : 60);
 			define('MAGPIE_CACHE_DIR', CACHE_DIR . "/magpie");
 
 			$rss = @fetch_rss($fetch_url);
@@ -282,7 +282,7 @@
 
 			$rss = new SimplePie();
 			$rss->set_useragent(SELF_USER_AGENT);
-#			$rss->set_timeout(10);
+			$rss->set_timeout($no_cache ? 15 : 60);
 			$rss->set_feed_url($fetch_url);
 			$rss->set_output_encoding('UTF-8');
 			//$rss->force_feed(true);
-- 
cgit v1.2.3