From faed0ae02f87c44c96e22e4eeaac53b217d9536a Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Wed, 13 Jan 2010 12:59:21 +0000
Subject: - prevent from PHP error when iconv doesn't support //IGNORE
 (#1486375)

git-svn-id: https://svn.roundcube.net/trunk@3205 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/main.inc         | 2 +-
 roundcubemail/program/include/rcube_shared.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'roundcubemail/program/include')

diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index 6b738e37a..36d39085d 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -195,7 +195,7 @@ function rcube_charset_convert($str, $from, $to=NULL)
 
   // convert charset using iconv module  
   if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') {
-    $_iconv = iconv($from, $to . '//IGNORE', $str);
+    $_iconv = @iconv($from, $to . '//IGNORE', $str);
     if ($_iconv !== false) {
         return $_iconv;
     }
diff --git a/roundcubemail/program/include/rcube_shared.inc b/roundcubemail/program/include/rcube_shared.inc
index b3d9a179a..bfd6740db 100644
--- a/roundcubemail/program/include/rcube_shared.inc
+++ b/roundcubemail/program/include/rcube_shared.inc
@@ -518,7 +518,7 @@ function rc_utf8_clean($input)
   if (function_exists('mb_convert_encoding') && ($res = mb_convert_encoding($input, 'UTF-8', 'UTF-8')) !== false)
     return $res;
 
-  if (function_exists('iconv') && ($res = iconv('UTF-8', 'UTF-8//IGNORE', $input)) !== false)
+  if (function_exists('iconv') && ($res = @iconv('UTF-8', 'UTF-8//IGNORE', $input)) !== false)
     return $res;
 
   $regexp = '/^('.
-- 
cgit v1.2.3