From 921408eba600a7dc51271c35480e9114cac5ecec Mon Sep 17 00:00:00 2001
From: defa <defa@so36.net>
Date: Wed, 05 Sep 2012 08:48:55 -0400
Subject: [PATCH] Merge https://github.com/roundcube/roundcubemail into crypt_hash_branch
---
program/include/rcube_charset.php | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/program/include/rcube_charset.php b/program/include/rcube_charset.php
index 380d149..1740a60 100644
--- a/program/include/rcube_charset.php
+++ b/program/include/rcube_charset.php
@@ -181,6 +181,12 @@
$to = empty($to) ? strtoupper(RCMAIL_CHARSET) : self::parse_charset($to);
$from = self::parse_charset($from);
+ // It is a common case when UTF-16 charset is used with US-ASCII content (#1488654)
+ // In that case we can just skip the conversion (use UTF-8)
+ if ($from == 'UTF-16' && !preg_match('/[^\x00-\x7F]/', $str)) {
+ $from = 'UTF-8';
+ }
+
if ($from == $to || empty($str) || empty($from)) {
return $str;
}
--
Gitblit v1.9.1