summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-10-08 08:48:52 +0200
committerGitHub <noreply@github.com>2019-10-08 08:48:52 +0200
commitf2d44b87bb3edaa502ea008a10c8f845b108e729 (patch)
tree8f8a495ec845b1d6743ba73d1d1f857f7d50377a /lib
parent76bdced6e3790c554cfa035235e2b6cb45706b7d (diff)
parent29a6f2d83003572972f8fa3eb0b9743b78081e0d (diff)
downloadnextcloud-server-f2d44b87bb3edaa502ea008a10c8f845b108e729.tar.gz
nextcloud-server-f2d44b87bb3edaa502ea008a10c8f845b108e729.zip
Merge pull request #17440 from nextcloud/enh/noid/log-json-escape
Do not escape slashes in log json
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Log/LogDetails.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Log/LogDetails.php b/lib/private/Log/LogDetails.php
index 712b5403ca0..e833221e222 100644
--- a/lib/private/Log/LogDetails.php
+++ b/lib/private/Log/LogDetails.php
@@ -90,12 +90,12 @@ abstract class LogDetails {
// them manually.
foreach($entry as $key => $value) {
if(is_string($value)) {
- $testEncode = json_encode($value);
+ $testEncode = json_encode($value, JSON_UNESCAPED_SLASHES);
if($testEncode === false) {
$entry[$key] = utf8_encode($value);
}
}
}
- return json_encode($entry, JSON_PARTIAL_OUTPUT_ON_ERROR);
+ return json_encode($entry, JSON_PARTIAL_OUTPUT_ON_ERROR | JSON_UNESCAPED_SLASHES);
}
}