Merge branch 'master' into phpunit

1 files changed, 11 insertions, 2 deletions

diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index 95e2af05b..738a29503 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -55,6 +55,8 @@ exit;
 function runTrimRecentChanges($media_changes = false) {
     global $conf;
 
+    echo "runTrimRecentChanges($media_changes): started".NL;
+
     $fn = ($media_changes ? $conf['media_changelog'] : $conf['changelog']);
 
     // Trim the Recent Changes
@@ -70,6 +72,7 @@ function runTrimRecentChanges($media_changes = false) {
             if (count($lines)<=$conf['recent']) {
                 // nothing to trim
                 io_unlock($fn);
+                echo "runTrimRecentChanges($media_changes): finished".NL;
                 return false;
             }
 
@@ -91,6 +94,7 @@ function runTrimRecentChanges($media_changes = false) {
               // nothing to trim
               @unlink($fn.'_tmp');
               io_unlock($fn);
+              echo "runTrimRecentChanges($media_changes): finished".NL;
               return false;
             }
 
@@ -114,10 +118,12 @@ function runTrimRecentChanges($media_changes = false) {
             } else {
                 io_unlock($fn);
             }
+            echo "runTrimRecentChanges($media_changes): finished".NL;
             return true;
     }
 
     // nothing done
+    echo "runTrimRecentChanges($media_changes): finished".NL;
     return false;
 }
 
@@ -160,11 +166,12 @@ function runSitemapper(){
  * @author Adrian Lang <lang@cosmocode.de>
  */
 function sendDigest() {
-    echo 'sendDigest(): start'.NL;
+    echo 'sendDigest(): started'.NL;
     global $ID;
     global $conf;
     if (!$conf['subscribers']) {
-        return;
+        echo 'sendDigest(): disabled'.NL;
+        return false;
     }
     $subscriptions = subscription_find($ID, array('style' => '(digest|list)',
                                                   'escaped' => true));
@@ -243,6 +250,8 @@ function sendDigest() {
     // restore current user info
     $USERINFO = $olduinfo;
     $_SERVER['REMOTE_USER'] = $olduser;
+    echo 'sendDigest(): finished'.NL;
+    return true;
 }
 
 /**