From b8d8cbda4535f76c468364ebbdb81d856ed8322c Mon Sep 17 00:00:00 2001 From: alecpl Date: Thu, 4 Nov 2010 13:05:29 +0000 Subject: [PATCH] - Skip conversion when input charset is BINARY --- program/include/main.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/program/include/main.inc b/program/include/main.inc index 242fb1ac3..4bf721336 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -197,7 +197,7 @@ function rcube_charset_convert($str, $from, $to=NULL) static $mbstring_list = null; static $convert_warning = false; static $conv = null; - + $error = false; $to = empty($to) ? strtoupper(RCMAIL_CHARSET) : rcube_parse_charset($to); @@ -341,6 +341,9 @@ function rcube_parse_charset($input) '/^X-/', // X- prefix (e.g. X-ROMAN8 => ROMAN8) ), '', $charset); + if ($charset == 'BINARY') + return $charsets[$input] = null; + # Aliases: some of them from HTML5 spec. $aliases = array( 'USASCII' => 'WINDOWS-1252',