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/include/iniset.php | 11 +++++++---- program/lib/Roundcube/bootstrap.php | 6 ++++-- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'program') diff --git a/program/include/iniset.php b/program/include/iniset.php index ca1e6ad75..d91b31436 100644 --- a/program/include/iniset.php +++ b/program/include/iniset.php @@ -68,11 +68,14 @@ spl_autoload_register('rcmail_autoload'); // backward compatybility (to be removed) require_once INSTALL_PATH . 'program/include/bc.php'; -// load the UTF-8 portablity layer from Patchwork -if (!function_exists('iconv') || !function_exists('utf8_encode') || !extension_loaded('mbstring')) { - \Patchwork\Utf8\Bootup::initAll(); +// load the UTF-8 portability layers from Patchwork +// don't load mbstring layer as it conflicts with Roundcube Framework (#1490280) +if (!function_exists('iconv')) { + \Patchwork\Utf8\Bootup::initIconv(); +} +if (!function_exists('utf8_encode')) { + \Patchwork\Utf8\Bootup::initUtf8Encode(); } - /** * PHP5 autoloader routine for dynamic class loading 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