From 0745f78b22f2526f25f6b1dcda59b02049d01264 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 14 Dec 2009 07:36:19 +0000
Subject: - fix empty strings handling in rc_utf8_clean()

git-svn-id: https://svn.roundcube.net/trunk@3179 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_shared.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'roundcubemail/program')

diff --git a/roundcubemail/program/include/rcube_shared.inc b/roundcubemail/program/include/rcube_shared.inc
index 547174b8a..fbab455c6 100644
--- a/roundcubemail/program/include/rcube_shared.inc
+++ b/roundcubemail/program/include/rcube_shared.inc
@@ -512,10 +512,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')))
+  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 rc_utf8_clean($input)
 function json_serialize($input)
 {
   $input = rc_utf8_clean($input);
-  
+
   return json_encode($input);
 }
 
-- 
cgit v1.2.3