From e5d60d69d4108a0e62270548117773244ca1905e Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 09 Dec 2009 03:18:47 -0500
Subject: [PATCH] - Use built-in json_encode() for proper JSON format in AJAX replies (and compat. with jQuery 1.4)
---
program/include/rcube_template.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 5226f8d..19f2d43 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -414,12 +414,12 @@
{
$out = '';
if (!$this->framed && !empty($this->js_env)) {
- $out .= JS_OBJECT_NAME . '.set_env('.json_serialize($this->js_env).");\n";
+ $out .= JS_OBJECT_NAME . '.set_env('.json_encode($this->js_env).");\n";
}
foreach ($this->js_commands as $i => $args) {
$method = array_shift($args);
foreach ($args as $i => $arg) {
- $args[$i] = json_serialize($arg);
+ $args[$i] = json_encode($arg);
}
$parent = $this->framed || preg_match('/^parent\./', $method);
$out .= sprintf(
--
Gitblit v1.9.1