summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-08-20 15:12:16 +0200
committerGitHub <noreply@github.com>2018-08-20 15:12:16 +0200
commit74618d101182736e0c7bbeaf2fa6aacbcf0b327e (patch)
treec99c20f420bb6377037c7ba6d59d7336bb6fa046
parentaef428733b2a4279b71fda730286a86e14b34433 (diff)
parent60ced31116912aae42b76a7c0031158532c97098 (diff)
downloadnextcloud-server-74618d101182736e0c7bbeaf2fa6aacbcf0b327e.tar.gz
nextcloud-server-74618d101182736e0c7bbeaf2fa6aacbcf0b327e.zip
Merge pull request #10760 from nextcloud/backport/10355/make-sure-error-log-always-receives-a-string
[stable13] Make sure error_log() always receives a string
-rw-r--r--lib/private/Log/File.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php
index b6a208ad68a..94f4f6b2e8a 100644
--- a/lib/private/Log/File.php
+++ b/lib/private/Log/File.php
@@ -144,6 +144,9 @@ class File {
error_log($entry);
}
if (php_sapi_name() === 'cli-server') {
+ if (!\is_string($message)) {
+ $message = json_encode($message);
+ }
error_log($message, 4);
}
}