summaryrefslogtreecommitdiff
path: root/program/include/rcube_shared.inc
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-01-09 18:28:01 +0000
committeralecpl <alec@alec.pl>2010-01-09 18:28:01 +0000
commit6481d4bbbebd19e2d7f97ae81f6d73cbc6183272 (patch)
treea8132625fc338ed821dab9c95cb14fe002c60b07 /program/include/rcube_shared.inc
parent57837fd6892aed4ad03f250e120f2b2c79e8a5a5 (diff)
- fix rc_utf8_clean() issues (#1486407)
Diffstat (limited to 'program/include/rcube_shared.inc')
-rw-r--r--program/include/rcube_shared.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 278f5a106..b3d9a179a 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -515,10 +515,10 @@ function rc_utf8_clean($input)
return $input;
// 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;
$regexp = '/^('.
@@ -536,7 +536,7 @@ function rc_utf8_clean($input)
$seq = '';
$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);
// 1-byte character