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/bootstrap.php') 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 From 3d6ce950097e591017514fb9400839c89fd589d9 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 1 Apr 2015 09:46:29 +0200 Subject: Fix PHP warning: Non-static method PEAR::setErrorHandling() should not be called statically (#1490343) --- CHANGELOG | 1 + program/lib/Roundcube/bootstrap.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'program/lib/Roundcube/bootstrap.php') diff --git a/CHANGELOG b/CHANGELOG index 41cd629de..428238269 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,7 @@ CHANGELOG Roundcube Webmail - Fix handling of %-encoded entities in mailto: URLs (#1490346) - Fix zipped messages downloads after selecting all messages in a folder (#1490339) - Fix vpopmaild driver of password plugin +- Fix PHP warning: Non-static method PEAR::setErrorHandling() should not be called statically (#1490343) RELEASE 1.1.1 ------------- diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php index 0c950dc14..ba7954e84 100644 --- a/program/lib/Roundcube/bootstrap.php +++ b/program/lib/Roundcube/bootstrap.php @@ -99,7 +99,7 @@ if (!preg_match($regexp, $path)) { spl_autoload_register('rcube_autoload'); // set PEAR error handling (will also load the PEAR main class) -PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error'); +@PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error'); -- cgit v1.2.3