summaryrefslogtreecommitdiff
path: root/program/include/rcube_json_output.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-12-11 16:53:54 +0000
committeralecpl <alec@alec.pl>2009-12-11 16:53:54 +0000
commit2717f9f68e74277379c065d32bd0771976e49c86 (patch)
treef53fee8d67b8cac77e00e0ced33f538f5eb228d2 /program/include/rcube_json_output.php
parentf47e2dc5ea51853ade73565261db43f36ceeee92 (diff)
- use proper unicode cleanup for JSON, fixes #1486356
Diffstat (limited to 'program/include/rcube_json_output.php')
-rw-r--r--program/include/rcube_json_output.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/program/include/rcube_json_output.php b/program/include/rcube_json_output.php
index cb8a7dbf4..080bab631 100644
--- a/program/include/rcube_json_output.php
+++ b/program/include/rcube_json_output.php
@@ -239,7 +239,7 @@ class rcube_json_output
if (!empty($this->callbacks))
$response['callbacks'] = $this->callbacks;
- echo json_encode($response);
+ echo json_serialize($response);
}
@@ -251,11 +251,11 @@ class rcube_json_output
private function get_js_commands()
{
$out = '';
-
+
foreach ($this->commands as $i => $args) {
$method = array_shift($args);
foreach ($args as $i => $arg) {
- $args[$i] = json_encode($arg);
+ $args[$i] = json_serialize($arg);
}
$out .= sprintf(