globalUpdateFeeds: disable debugging info

diff --git a/classes/public_handler.php b/classes/public_handler.php
index 0c38a0464b99a8ee34ca1a3847011021cd4ce014..0896e498c26177a435f721143dc6a16ef591ac90 100644 (file)
--- 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 679e0b2155d3594b09ba28f5a971dd3a21dac557..e561d8e3dcef3fd56fe7a8322cacb8c55eb5dfad 100644 (file)
--- 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 7588428de958b14d1838c45e1c5cf54599bf840e..0fc462c48728cf0ae2562ab5f75627430f65e0ae 100644 (file)
--- 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