From 003b1d193f096c69d1fe92c916bf2543f829e7f2 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Fri, 11 Dec 2009 16:53:54 +0000
Subject: - use proper unicode cleanup for JSON, fixes #1486356

git-svn-id: https://svn.roundcube.net/trunk@3175 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_json_output.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'roundcubemail/program/include/rcube_json_output.php')

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(
-- 
cgit v1.2.3