From 9e147a36adfa6e14ab66ea3b2bcb848eeba2c276 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 22 Feb 2015 05:47:42 -0500
Subject: [PATCH] Fix fatal errors on systems without mbstring extension or mb_regex_encoding() function (#1490280)
---
program/lib/Roundcube/bootstrap.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index 49b0dd3..5c069d8 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -78,9 +78,11 @@
}
// 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
--
Gitblit v1.9.1