summaryrefslogtreecommitdiff
path: root/program/lib/Roundcube
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2015-02-22 11:47:14 +0100
committerAleksander Machniak <alec@alec.pl>2015-02-22 11:47:14 +0100
commitf070da7c27e151353efd6dd7a639418991f73c7c (patch)
treec5fe1b645059438602a968f74a0eda895d4682bf /program/lib/Roundcube
parentbd82526e41e54fa001c851d48b4e7823aa5e7bcd (diff)
Fix fatal errors on systems without mbstring extension or mb_regex_encoding() function (#1490280)
Diffstat (limited to 'program/lib/Roundcube')
-rw-r--r--program/lib/Roundcube/bootstrap.php6
1 files changed, 4 insertions, 2 deletions
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