Make sure log messages are trimmed correctly for clean log output.

1 files changed, 4 insertions, 1 deletions

diff --git a/core/Log.php b/core/Log.php
index 54b96a8302..a860dd1989 100644
--- a/core/Log.php
+++ b/core/Log.php
@@ -256,7 +256,7 @@ class Log extends Singleton
     {
         return str_replace(
             array("%tag%", "%message%", "%datetime%", "%level%"),
-            array($tag, $message, $datetime, $this->getStringLevel($level)),
+            array($tag, trim($message), $datetime, $this->getStringLevel($level)),
             $this->logMessageFormat
         );
     }
@@ -590,6 +590,7 @@ class Log extends Singleton
              */
             Piwik::postEvent(self::FORMAT_SCREEN_MESSAGE_EVENT, array(&$message, $level, $tag, $datetime, $logger));
         }
+        $message = trim($message);
         return $message . "\n";
     }
 
@@ -643,6 +644,7 @@ class Log extends Singleton
              */
             Piwik::postEvent(self::FORMAT_DATABASE_MESSAGE_EVENT, array(&$message, $level, $tag, $datetime, $logger));
         }
+        $message = trim($message);
         return $message;
     }
 
@@ -684,6 +686,7 @@ class Log extends Singleton
             Piwik::postEvent(self::FORMAT_FILE_MESSAGE_EVENT, array(&$message, $level, $tag, $datetime, $logger));
         }
 
+        $message = trim($message);
         $message = str_replace("\n", "\n  ", $message);
         return $message . "\n";
     }