From f070da7c27e151353efd6dd7a639418991f73c7c Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sun, 22 Feb 2015 11:47:14 +0100 Subject: Fix fatal errors on systems without mbstring extension or mb_regex_encoding() function (#1490280) --- program/lib/Roundcube/bootstrap.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'program/lib/Roundcube') diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php index 24c1f86d4..0c950dc14 100644 --- a/program/lib/Roundcube/bootstrap.php +++ b/program/lib/Roundcube/bootstrap.php @@ -78,9 +78,11 @@ if (!defined('RCUBE_LOCALIZATION_DIR')) { } // set internal encoding for mbstring extension -if (extension_loaded('mbstring')) { +if (function_exists('mb_internal_encoding')) { mb_internal_encoding(RCUBE_CHARSET); - @mb_regex_encoding(RCUBE_CHARSET); +} +if (function_exists('mb_regex_encoding')) { + mb_regex_encoding(RCUBE_CHARSET); } // make sure the Roundcube lib directory is in the include_path -- cgit v1.2.3