From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 1 Apr 2016 15:54:53 +0000 (+0300)
Subject: daemon common: use proper update condition checking for secondary-selected feeds
X-Git-Tag: 16.8~33
X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=9e84bab449f9ed55e02e60378b0af1521026f3b8

daemon common: use proper update condition checking for secondary-selected feeds
---

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index bf603567..27e8ffc1 100755
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -193,9 +193,8 @@
 				ttrss_users.id = ttrss_user_prefs.owner_uid AND
 				ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' AND
 				ttrss_user_prefs.profile IS NULL AND
-				feed_url = '".db_escape_string($feed)."' AND
-				(ttrss_feeds.update_interval > 0 OR
-					ttrss_user_prefs.value != '-1')
+				feed_url = '".db_escape_string($feed)."'
+				$update_limit_qpart
 				$login_thresh_qpart
 			ORDER BY ttrss_feeds.id $query_limit");