From ecbd5b5d53a9d9d8d24c84dcf2ebf7682f77107d Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 13 Jan 2010 07:59:21 -0500
Subject: [PATCH] - prevent from PHP error when iconv doesn't support //IGNORE (#1486375)
---
program/include/rcube_shared.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index b3d9a17..bfd6740 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -518,7 +518,7 @@
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 = '/^('.
--
Gitblit v1.9.1