From 35bf080c318d6611c15c331061a553c85bec5612 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Mon, 29 Oct 2007 08:24:43 +0100
Subject: fix broken feed refresh w/o daemon

---
 functions.php        | 8 ++++----
 mobile/functions.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/functions.php b/functions.php
index a7bae8558..a939beaf5 100644
--- a/functions.php
+++ b/functions.php
@@ -1934,7 +1934,7 @@
 			}
 	}
 
-	function update_generic_feed($link, $feed, $cat_view) {
+	function update_generic_feed($link, $feed, $cat_view, $force_update = false) {
 			if ($cat_view) {
 
 				if ($feed > 0) {
@@ -1949,14 +1949,14 @@
 				while ($tmp_line = db_fetch_assoc($tmp_result)) {					
 					$feed_url = $tmp_line["feed_url"];
 					$feed_id = $tmp_line["id"];
-					update_rss_feed($link, $feed_url, $feed_id, ENABLE_UPDATE_DAEMON);
+					update_rss_feed($link, $feed_url, $feed_id, $force_update);
 				}
 
 			} else {
 				$tmp_result = db_query($link, "SELECT feed_url FROM ttrss_feeds
 					WHERE id = '$feed'");
 				$feed_url = db_fetch_result($tmp_result, 0, "feed_url");				
-				update_rss_feed($link, $feed_url, $feed, ENABLE_UPDATE_DAEMON);
+				update_rss_feed($link, $feed_url, $feed, $force_update);
 			}
 	}
 
@@ -4333,7 +4333,7 @@
 		}
 
 		if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0) {
-			update_generic_feed($link, $feed, $cat_view);
+			update_generic_feed($link, $feed, $cat_view, true);
 		}
 
 		if ($subop == "MarkAllRead")  {
diff --git a/mobile/functions.php b/mobile/functions.php
index 283087299..07a7544de 100644
--- a/mobile/functions.php
+++ b/mobile/functions.php
@@ -335,7 +335,7 @@
 		print "<div id=\"headlines\" $rtl_tag>";
 
 		if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0) {
-			update_generic_feed($link, $feed, $cat_view);
+			update_generic_feed($link, $feed, $cat_view, true);
 		}
 
 		if ($subop == "MarkAllRead")  {
-- 
cgit v1.2.3