Changeset 3052 in subversion

Timestamp:

Oct 22, 2009 2:37:00 PM (4 years ago)

Author:

alec

Message:

• fix rc_utf8_clean() on Windows (#1486232)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_shared.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -4 +4 @@
 - Added server-side e-mail address validation with 'email_dns_check' option (#1485857)
 - Fix login page loading into an iframe when session expires (#1485952)
-- added option 'force_https_port' in 'force_https' plugin (#1486091)
+- Allow setting port number in 'force_https' option (#1486091)
 - Option 'force_https' replaced by 'force_https' plugin
 - Fix IE issue with non-UTF-8 characters in AJAX response (#1486159)

trunk/roundcubemail/program/include/rcube_shared.inc

@@ -600 +600 @@
   }
   
-  if (!is_string($input))
+  if (!is_string($input) || $input == '')
     return $input;
   
-  // iconv is 10x faster
-  if (function_exists('iconv'))
-    return iconv('UTF8', 'UTF8//IGNORE', $input);
+  // iconv/mbstring are much faster (especially with long strings)
+  if (function_exists('mb_convert_encoding') && ($res = mb_convert_encoding($input, 'UTF8', 'UTF8')))
+    return $res;
+
+  if (function_exists('iconv') && ($res = iconv('UTF8', 'UTF8//IGNORE', $input)))
+    return $res;
 
   $regexp = '/^('.