From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Thu, 24 Jan 2008 03:54:45 +0000 (+0100)
Subject: update_daemon2: fix the never-update bug
X-Git-Tag: 1.2.20~69
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=39a5249904b186a164bc47fcb19317389469c674;p=tt-rss.git

update_daemon2: fix the never-update bug
---

diff --git a/functions.php b/functions.php
index 42c5c277..5ab98829 100644
--- a/functions.php
+++ b/functions.php
@@ -469,15 +469,25 @@
 			_debug("update_rss_feed: start");
 		}
 
-		if (DB_TYPE == "pgsql") {
-				$updstart_thresh_qpart = "(ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '120 seconds')";
-			} else {
-				$updstart_thresh_qpart = "(ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 120 SECOND))";
-			}			
+		if (!$ignore_daemon) {
+
+			if (DB_TYPE == "pgsql") {
+					$updstart_thresh_qpart = "(ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '120 seconds')";
+				} else {
+					$updstart_thresh_qpart = "(ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 120 SECOND))";
+				}			
+	
+			$result = db_query($link, "SELECT id,update_interval,auth_login,
+				auth_pass,cache_images
+				FROM ttrss_feeds WHERE id = '$feed' AND $updstart_thresh_qpart");
+
+		} else {
 
-		$result = db_query($link, "SELECT id,update_interval,auth_login,
-			auth_pass,cache_images
-			FROM ttrss_feeds WHERE id = '$feed' AND $updstart_thresh_qpart");
+			$result = db_query($link, "SELECT id,update_interval,auth_login,
+				auth_pass,cache_images
+				FROM ttrss_feeds WHERE id = '$feed'");
+
+		}
 
 		if (db_num_rows($result) == 0) {
 			if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {