From 65ab4040fc24236a39b8c4ff25f0f71807b6b7ee Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Sat, 6 Mar 2004 19:30:35 +0000 Subject: [PATCH] MFH: Fixed bug #27421 (mbstring.func_overload should be system ini setting) --- NEWS | 2 ++ ext/mbstring/mbstring.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 394816eb59..2feea61176 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,8 @@ PHP 4 NEWS (Ilia, naish at klanen dot net) - Fixed bug #27443 (defined() returns wrong type). (Derick) - Fixed bug #27437 (wrong freetype include inside GD library). (Ilia) +- Fixed bug #27421 (mbstring.func_overload should be system ini setting). + (Ilia) - Fixed bug #27384 (unpack() misbehaves with 1 char string). (GeorgeS) - Fixed bug #27383 (Potential crash inside fopen_wrapper, while parsing response code). (Ilia) diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 55b7ebe913..4a86cd99c4 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -792,8 +792,7 @@ PHP_INI_BEGIN() PHP_INI_ENTRY("mbstring.script_encoding", NULL, PHP_INI_ALL, OnUpdate_mbstring_script_encoding) #endif /* ZEND_MULTIBYTE */ PHP_INI_ENTRY("mbstring.substitute_character", NULL, PHP_INI_ALL, OnUpdate_mbstring_substitute_character) - STD_PHP_INI_ENTRY("mbstring.func_overload", "0", PHP_INI_SYSTEM | - PHP_INI_PERDIR, OnUpdateInt, func_overload, zend_mbstring_globals, mbstring_globals) + STD_PHP_INI_ENTRY("mbstring.func_overload", "0", PHP_INI_SYSTEM, OnUpdateInt, func_overload, zend_mbstring_globals, mbstring_globals) STD_PHP_INI_BOOLEAN("mbstring.encoding_translation", "0", PHP_INI_SYSTEM | PHP_INI_PERDIR, OnUpdate_mbstring_encoding_translation, -- 2.50.1