From f070da7c27e151353efd6dd7a639418991f73c7c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 22 Feb 2015 05:47:14 -0500
Subject: [PATCH] Fix fatal errors on systems without mbstring extension or mb_regex_encoding() function (#1490280)
---
program/include/iniset.php | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 19a244f..d91b314 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -21,7 +21,7 @@
*/
// application constants
-define('RCMAIL_VERSION', '1.1.0');
+define('RCMAIL_VERSION', '1.2-git');
define('RCMAIL_START', microtime(true));
if (!defined('INSTALL_PATH')) {
@@ -68,11 +68,14 @@
// 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
--
Gitblit v1.9.1