diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-10-12 16:06:33 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-10-12 16:06:33 +0000 |
| commit | d6832b4ade38590692ea26805c62111f5bcfb8f7 (patch) | |
| tree | 601b97ef491b235870f08cf2bb75354cb693d019 /roundcubemail/program/steps | |
| parent | 42a052472943ecd1d56764f457ae740d23d65bc5 (diff) | |
- Fix IE issue with non-UTF-8 characters in AJAX response (#1486159)
git-svn-id: https://svn.roundcube.net/trunk@3036 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps')
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 5 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/headers.inc | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index bca2f8cd1..0a8664cde 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -457,7 +457,10 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $replace=TRUE) $a_msg_flags['forwarded'] = 1; 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, diff --git a/roundcubemail/program/steps/mail/headers.inc b/roundcubemail/program/steps/mail/headers.inc index 653fb9647..4e3f969bd 100644 --- a/roundcubemail/program/steps/mail/headers.inc +++ b/roundcubemail/program/steps/mail/headers.inc @@ -24,6 +24,11 @@ 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/', ' ', $source); $source = preg_replace('/^([a-z0-9_:-]+)/im', '<font class="bold">'.'\1'.'</font>', $source); |