Do not decorate the CLI output if it's explicitly turned off

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

diff --git a/lib/private/Console/TimestampFormatter.php b/lib/private/Console/TimestampFormatter.php
index 59e480b39e8d8227e3aeba097657b6d6f54ec1db..c25ed578805afef16c652e55140b18550eecfab3 100644 (file)
--- a/lib/private/Console/TimestampFormatter.php
+++ b/lib/private/Console/TimestampFormatter.php
@@ -99,6 +99,11 @@ class TimestampFormatter implements OutputFormatterInterface {
         * log timezone and dateformat, e.g. "2015-06-23T17:24:37+02:00"
         */
        public function format($message) {
+               if (!$this->formatter->isDecorated()) {
+                       // Don't add anything to the output when we shouldn't
+                       return $this->formatter->format($message);
+               }
+
                $timeZone = $this->config->getSystemValue('logtimezone', 'UTC');
                $timeZone = $timeZone !== null ? new \DateTimeZone($timeZone) : null;