Merge pull request #31880 from nextcloud/backport/31877/stable23

[stable23] Do not decorate the CLI output if it's explicitly turned off
nextcloud · Apr 14, 2022 · 35c7d14 · 35c7d14
2 parents bc52905 + 065eda3
commit 35c7d14
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/private/Console/TimestampFormatter.php b/lib/private/Console/TimestampFormatter.php
@@ -99,6 +99,11 @@ public function getStyle($name) {
 	 * 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;