- use proper unicode cleanup for JSON, fixes #1486356

git-svn-id: https://svn.roundcube.net/trunk@3175 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 2 insertions, 2 deletions

diff --git a/roundcubemail/program/include/rcube_template.php b/roundcubemail/program/include/rcube_template.php
index 19f2d430b..5226f8db8 100755
--- a/roundcubemail/program/include/rcube_template.php
+++ b/roundcubemail/program/include/rcube_template.php
@@ -414,12 +414,12 @@ class rcube_template extends rcube_html_page
     {
         $out = '';
         if (!$this->framed && !empty($this->js_env)) {
-            $out .= JS_OBJECT_NAME . '.set_env('.json_encode($this->js_env).");\n";
+            $out .= JS_OBJECT_NAME . '.set_env('.json_serialize($this->js_env).");\n";
         }
         foreach ($this->js_commands as $i => $args) {
             $method = array_shift($args);
             foreach ($args as $i => $arg) {
-                $args[$i] = json_encode($arg);
+                $args[$i] = json_serialize($arg);
             }
             $parent = $this->framed || preg_match('/^parent\./', $method);
             $out .= sprintf(