From 63ffe33c016e3f5a016d4ea961b12caa9c5b20c3 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 14 Dec 2009 02:36:19 -0500
Subject: [PATCH] - fix empty strings handling in rc_utf8_clean()
---
program/include/rcube_shared.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 547174b..fbab455 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -512,10 +512,10 @@
return $input;
// iconv/mbstring are much faster (especially with long strings)
- if (function_exists('mb_convert_encoding') && ($res = mb_convert_encoding($input, 'UTF8', 'UTF8')))
+ if (function_exists('mb_convert_encoding') && ($res = mb_convert_encoding($input, 'UTF8', 'UTF8')) !== false)
return $res;
- if (function_exists('iconv') && ($res = iconv('UTF8', 'UTF8//IGNORE', $input)))
+ if (function_exists('iconv') && ($res = iconv('UTF8', 'UTF8//IGNORE', $input)) !== false)
return $res;
$regexp = '/^('.
@@ -573,7 +573,7 @@
function json_serialize($input)
{
$input = rc_utf8_clean($input);
-
+
return json_encode($input);
}
--
Gitblit v1.9.1