summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include/rcube_json_output.php
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-12-11 16:53:54 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-12-11 16:53:54 +0000
commit003b1d193f096c69d1fe92c916bf2543f829e7f2 (patch)
tree0d5b656117d4f78ec25e31e8b00defc2110dc115 /roundcubemail/program/include/rcube_json_output.php
parentdfba922026ab5fdce33d84ae1be28b684ca63d38 (diff)
- use proper unicode cleanup for JSON, fixes #1486356
git-svn-id: https://svn.roundcube.net/trunk@3175 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/rcube_json_output.php')
-rw-r--r--roundcubemail/program/include/rcube_json_output.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/roundcubemail/program/include/rcube_json_output.php b/roundcubemail/program/include/rcube_json_output.php
index cb8a7dbf4..080bab631 100644
--- a/roundcubemail/program/include/rcube_json_output.php
+++ b/roundcubemail/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(