moriyoshi Sun Nov 10 15:53:36 2002 EDT
Modified files:
/php4/ext/mbstring mbstring.c
Log:
Changed the default settings so that it shouldn't affect htmlentities()
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.132 php4/ext/mbstring/mbstring.c:1.133
--- php4/ext/mbstring/mbstring.c:1.132 Sun Nov 10 14:05:51 2002
+++ php4/ext/mbstring/mbstring.c Sun Nov 10 15:53:36 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.132 2002/11/10 19:05:51 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.133 2002/11/10 20:53:36 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -728,11 +728,11 @@
/* {{{ php.ini directive registration */
PHP_INI_BEGIN()
- PHP_INI_ENTRY("mbstring.language", NULL, PHP_INI_SYSTEM | PHP_INI_PERDIR,
OnUpdate_mbstring_language)
+ PHP_INI_ENTRY("mbstring.language", "none", PHP_INI_SYSTEM | PHP_INI_PERDIR,
+OnUpdate_mbstring_language)
PHP_INI_ENTRY("mbstring.detect_order", NULL, PHP_INI_ALL,
OnUpdate_mbstring_detect_order)
- PHP_INI_ENTRY("mbstring.http_input", NULL, PHP_INI_ALL,
OnUpdate_mbstring_http_input)
- PHP_INI_ENTRY("mbstring.http_output", NULL, PHP_INI_ALL,
OnUpdate_mbstring_http_output)
- PHP_INI_ENTRY("mbstring.internal_encoding", NULL, PHP_INI_ALL,
OnUpdate_mbstring_internal_encoding)
+ PHP_INI_ENTRY("mbstring.http_input", "pass", PHP_INI_ALL,
+OnUpdate_mbstring_http_input)
+ PHP_INI_ENTRY("mbstring.http_output", "pass", PHP_INI_ALL,
+OnUpdate_mbstring_http_output)
+ PHP_INI_ENTRY("mbstring.internal_encoding", "none", PHP_INI_ALL,
+OnUpdate_mbstring_internal_encoding)
#ifdef ZEND_MULTIBYTE
PHP_INI_ENTRY("mbstring.script_encoding", NULL, PHP_INI_ALL,
OnUpdate_mbstring_script_encoding)
#endif /* ZEND_MULTIBYTE */
@@ -750,10 +750,10 @@
static void
php_mb_init_globals(zend_mbstring_globals *pglobals TSRMLS_DC)
{
- MBSTRG(language) = mbfl_no_language_english;
- MBSTRG(current_language) = mbfl_no_language_english;
- MBSTRG(internal_encoding) = mbfl_no_encoding_8859_1;
- MBSTRG(current_internal_encoding) = mbfl_no_encoding_8859_1;
+ MBSTRG(language) = mbfl_no_language_uni;
+ MBSTRG(current_language) = MBSTRG(language);
+ MBSTRG(internal_encoding) = mbfl_no_encoding_pass;
+ MBSTRG(current_internal_encoding) = MBSTRG(internal_encoding);
#ifdef ZEND_MULTIBYTE
MBSTRG(script_encoding_list) = NULL;
MBSTRG(script_encoding_list_size) = 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
