Changeset 3195 in subversion

Timestamp:

Jan 9, 2010 1:28:01 PM (3 years ago)

Author:

alec

Message:

• fix rc_utf8_clean() issues (#1486407)

File:

• trunk/roundcubemail/program/include/rcube_shared.inc (modified) (2 diffs)

trunk/roundcubemail/program/include/rcube_shared.inc

@@ -516 +516 @@
 
   // iconv/mbstring are much faster (especially with long strings)
-  if (function_exists('mb_convert_encoding') && ($res = mb_convert_encoding($input, 'UTF8', 'UTF8')) !== false)
+  if (function_exists('mb_convert_encoding') && ($res = mb_convert_encoding($input, 'UTF-8', 'UTF-8')) !== false)
     return $res;
 
-  if (function_exists('iconv') && ($res = iconv('UTF8', 'UTF8//IGNORE', $input)) !== false)
+  if (function_exists('iconv') && ($res = iconv('UTF-8', 'UTF-8//IGNORE', $input)) !== false)
     return $res;
 
@@ -537 +537 @@
   $out = '';
 
-  for ($i = 0, $len = strlen($input)-1; $i < $len; $i++) {
+  for ($i = 0, $len = strlen($input); $i < $len; $i++) {
     $chr = $input[$i];
     $ord = ord($chr);