From 47faa63a0e2bf55acd12fe8271812c57a9cfd98c Mon Sep 17 00:00:00 2001 From: Uwe Tews Date: Wed, 31 Dec 2014 06:07:17 +0100 Subject: [PATCH] use function_exists('mb_get_info') for setting Smarty::$_MBSTRING Function mb_split could be overloaded depending on php.ini mbstring.func_overload --- change_log.txt | 5 +++++ libs/Smarty.class.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/change_log.txt b/change_log.txt index c07a64e6..d4a2a90a 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,9 @@  ===== 3.1.22-dev ===== (xx.xx.2014) + 31.12.22014 + - bugfix use function_exists('mb_get_info') for setting Smarty::$_MBSTRING. + Function mb_split could be overloaded depending on php.ini mbstring.func_overload + + 29.12.2014 - new feature security can now limit the template nesting level by property $max_template_nesting see also NEW_FEATURES.txt (forum 25370) diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index fa2ddffe..f9b7b328 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -53,7 +53,7 @@ if (!defined('SMARTY_PLUGINS_DIR')) { define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DS); } if (!defined('SMARTY_MBSTRING')) { - define('SMARTY_MBSTRING', function_exists('mb_split')); + define('SMARTY_MBSTRING', function_exists('mb_get_info')); } if (!defined('SMARTY_RESOURCE_CHAR_SET')) { // UTF-8 can only be done properly when mbstring is available!