summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-07-23 21:17:38 +0200
committerGitHub <noreply@github.com>2018-07-23 21:17:38 +0200
commitf25d34b293f88cc490c3eca0d2eac4e98a00e3e4 (patch)
tree41900e2dfc16610ff40af894988619715da2cadc /lib/private
parenta5b76d7932b037c13bad0e00d5b975f725014be8 (diff)
parentb788f0a456d7c71d1270f8cf0288e8bb71fe8fcc (diff)
downloadnextcloud-server-f25d34b293f88cc490c3eca0d2eac4e98a00e3e4.tar.gz
nextcloud-server-f25d34b293f88cc490c3eca0d2eac4e98a00e3e4.zip
Merge pull request #10355 from nextcloud/bugfix/noid/make-sure-error-log-always-receives-a-string
Make sure error_log() always receives a string
Diffstat (limited to 'lib/private')
-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 597cb54e402..c881c6dd9de 100644
--- a/lib/private/Log/File.php
+++ b/lib/private/Log/File.php
@@ -145,6 +145,9 @@ class File implements IWriter, IFileBased {
error_log($entry);
}
if (php_sapi_name() === 'cli-server') {
+ if (!\is_string($message)) {
+ $message = json_encode($message);
+ }
error_log($message, 4);
}
}