hirokawa Sat Feb 11 02:26:08 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/mbstring mbstring.c
Log:
MFH
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.13&r2=1.224.2.14&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.13
php-src/ext/mbstring/mbstring.c:1.224.2.14
--- php-src/ext/mbstring/mbstring.c:1.224.2.13 Mon Feb 6 10:41:28 2006
+++ php-src/ext/mbstring/mbstring.c Sat Feb 11 02:26:07 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.224.2.13 2006/02/06 10:41:28 tony2001 Exp $ */
+/* $Id: mbstring.c,v 1.224.2.14 2006/02/11 02:26:07 hirokawa Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -3334,6 +3334,7 @@
}
if (!typ || !strcasecmp("all", typ)) {
+ const mbfl_language *lang =
mbfl_no2language(MBSTRG(current_language));
array_init(return_value);
if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(current_internal_encoding))) != NULL) {
add_assoc_string(return_value, "internal_encoding",
name, 1);
@@ -3347,6 +3348,14 @@
if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(func_overload))) != NULL) {
add_assoc_string(return_value, "func_overload", name,
1);
}
+ if (lang != NULL) {
+ add_assoc_string(return_value, "mail_charset",
+
mbfl_no_encoding2name(lang->mail_charset), 1);
+ add_assoc_string(return_value, "mail_header_encoding",
+
mbfl_no_encoding2name(lang->mail_header_encoding), 1);
+ add_assoc_string(return_value, "mail_body_encoding",
+
mbfl_no_encoding2name(lang->mail_body_encoding), 1);
+ }
} else if (!strcasecmp("internal_encoding", typ)) {
if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(current_internal_encoding))) != NULL) {
RETVAL_STRING(name, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
