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/compose.inc | 2 +-
 program/steps/mail/func.inc    | 5 +----
 program/steps/mail/headers.inc | 5 -----
 3 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'program/steps')

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 842f28c60..560142b90 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -505,7 +505,7 @@ function rcmail_compose_body($attrib)
       JQ(Q(rcube_label('close'))),
       JQ(Q(rcube_label('revertto'))),
       JQ(Q(rcube_label('nospellerrors'))),
-      json_encode($spellcheck_langs),
+      json_serialize($spellcheck_langs),
       $lang,
       $attrib['id'],
       JS_OBJECT_NAME), 'foot');
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 = '';
     }
   
diff --git a/program/steps/mail/headers.inc b/program/steps/mail/headers.inc
index 4e3f969bd..653fb9647 100644
--- a/program/steps/mail/headers.inc
+++ b/program/steps/mail/headers.inc
@@ -24,11 +24,6 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_POST))
 
   if ($source)
     {
-    $browser = new rcube_browser;
-    
-    if ($browser->ie)
-      $source = rc_utf8_clean($source);	  
-
     $source = htmlspecialchars(trim($source));
     $source = preg_replace('/\t/', '&nbsp;&nbsp;&nbsp;&nbsp;', $source);
     $source = preg_replace('/^([a-z0-9_:-]+)/im', '<font class="bold">'.'\1'.'</font>', $source);
-- 
cgit v1.2.3