From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 24 Dec 2011 20:17:22 +0000 (+0400)
Subject: globalUpdateFeeds: disable debugging info
X-Git-Tag: 1.5.9~54
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=036cd3a4106cf2eee0be72f0695458dfb517976b;p=tt-rss.git

globalUpdateFeeds: disable debugging info
---

diff --git a/classes/public_handler.php b/classes/public_handler.php
index 0c38a046..0896e498 100644
--- a/classes/public_handler.php
+++ b/classes/public_handler.php
@@ -304,7 +304,7 @@ class Public_Handler extends Handler {
 	function globalUpdateFeeds() {
 		include "rssfuncs.php";
 		// Update all feeds needing a update.
-		update_daemon_common($this->link, 0, true, true);
+		update_daemon_common($this->link, 0, true, false);
 	}
 }
 ?>
diff --git a/include/functions.php b/include/functions.php
index 679e0b21..e561d8e3 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2633,14 +2633,14 @@
 	 * @param integer $limit The maximum number of articles by digest.
 	 * @return boolean Return false if digests are not enabled.
 	 */
-	function send_headlines_digests($link, $limit = 100) {
+	function send_headlines_digests($link, $limit = 100, $debug = true) {
 
 		require_once 'lib/phpmailer/class.phpmailer.php';
 
 		$user_limit = 15; // amount of users to process (e.g. emails to send out)
 		$days = 1;
 
-		print "Sending digests, batch of max $user_limit users, days = $days, headline limit = $limit\n\n";
+		if ($debug) _debug("Sending digests, batch of max $user_limit users, days = $days, headline limit = $limit");
 
 		if (DB_TYPE == "pgsql") {
 			$interval_query = "last_digest_sent < NOW() - INTERVAL '$days days'";
@@ -2709,7 +2709,7 @@
 			}
 		}
 
-		print "All done.\n";
+		if ($debug) _debug("All done.");
 
 	}
 
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 7588428d..0fc462c4 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -147,7 +147,7 @@
 		}
 
 		// Send feed digests by email if needed.
-		send_headlines_digests($link);
+		send_headlines_digests($link, 100, $debug);
 
 	} // function update_daemon_common