summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include/rcube_json_output.php
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-12-09 08:18:47 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-12-09 08:18:47 +0000
commit51d658497099bb388405ac642c29a3b5136ad05e (patch)
tree92f9e531b6b525e8fc8db7b72d8c8c758f01b582 /roundcubemail/program/include/rcube_json_output.php
parent967de2f3fe4ba59d87ab5d73b716865970983f36 (diff)
- Use built-in json_encode() for proper JSON format in AJAX replies (and compat. with jQuery 1.4)
git-svn-id: https://svn.roundcube.net/trunk@3170 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/rcube_json_output.php')
-rw-r--r--roundcubemail/program/include/rcube_json_output.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/include/rcube_json_output.php b/roundcubemail/program/include/rcube_json_output.php
index ea23dc20b..cb8a7dbf4 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_serialize($response);
+ echo json_encode($response);
}
@@ -255,7 +255,7 @@ class rcube_json_output
foreach ($this->commands as $i => $args) {
$method = array_shift($args);
foreach ($args as $i => $arg) {
- $args[$i] = json_serialize($arg);
+ $args[$i] = json_encode($arg);
}
$out .= sprintf(