Make sure arrays are formatted correctly in Log calls w/ sprintf params and indent message newlines so they can be more easily parsed.

1 files changed, 9 insertions, 0 deletions

diff --git a/core/Log.php b/core/Log.php
index 4e505f7b63..54b96a8302 100644
--- a/core/Log.php
+++ b/core/Log.php
@@ -418,6 +418,13 @@ class Log extends Singleton
         if (is_string($message)
             && !empty($sprintfParams)
         ) {
+            // handle array sprintf parameters
+            foreach ($sprintfParams as &$param) {
+                if (is_array($param)) {
+                    $param = json_encode($param);
+                }
+            }
+
             $message = vsprintf($message, $sprintfParams);
         }
 
@@ -676,6 +683,8 @@ class Log extends Singleton
              */
             Piwik::postEvent(self::FORMAT_FILE_MESSAGE_EVENT, array(&$message, $level, $tag, $datetime, $logger));
         }
+
+        $message = str_replace("\n", "\n  ", $message);
         return $message . "\n";
     }
 }