From 2717f9f68e74277379c065d32bd0771976e49c86 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 11 Dec 2009 16:53:54 +0000
Subject: - use proper unicode cleanup for JSON, fixes #1486356

---
 program/steps/mail/func.inc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'program/steps/mail/func.inc')

diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 94f455a1b..b874817ff 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -458,9 +458,6 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $replace=TRUE)
     if ($header->flagged)
       $a_msg_flags['flagged'] = 1;
       
-    if ($browser->ie)
-      $a_msg_cols = rc_utf8_clean($a_msg_cols);
-    
     $OUTPUT->command('add_message_row',
       $header->uid,
       $a_msg_cols,
@@ -522,7 +519,7 @@ function rcmail_quota_display($attrib)
   
   if (is_array($quota)) {
     $OUTPUT->add_script('$(document).ready(function(){
-	rcmail.set_quota('.json_encode($quota).')});', 'foot');
+	rcmail.set_quota('.json_serialize($quota).')});', 'foot');
     $quota = '';
     }
   
-- 
cgit v1.2.3