summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoriyoshi Koizumi <moriyoshi@php.net>2004-03-10 20:55:42 +0000
committerMoriyoshi Koizumi <moriyoshi@php.net>2004-03-10 20:55:42 +0000
commite84334a597ae78098f87b35e52d9a88e61834eae (patch)
tree254db373ba4c8eebaccf5200490073d90f8894d2
parent05f8b4e6bc76724e9f37de5c209d77b260617309 (diff)
downloadphp-git-e84334a597ae78098f87b35e52d9a88e61834eae.tar.gz
- Revert ini setting patch, as I notified in
http://news.php.net/article.php?group=php.internals&article=8451
-rw-r--r--ext/mbstring/mbstring.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 0d1ce6982c..b48a69b518 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -701,7 +701,8 @@ 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, OnUpdateLong, func_overload, zend_mbstring_globals, mbstring_globals)
+ STD_PHP_INI_ENTRY("mbstring.func_overload", "0", PHP_INI_SYSTEM |
+ PHP_INI_PERDIR, OnUpdateLong, 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,