diff options
| author | Rui Hirokawa <hirokawa@php.net> | 2006-02-11 02:26:07 +0000 |
|---|---|---|
| committer | Rui Hirokawa <hirokawa@php.net> | 2006-02-11 02:26:07 +0000 |
| commit | e8d38828cd1a77b5c5edc0e5357986065c50bb00 (patch) | |
| tree | db13c806a4d279b7201556707cfcc21dba57ecf8 | |
| parent | 08c4c9c2028f8012542b7c9d595ff0f1a338221e (diff) | |
| download | php-git-e8d38828cd1a77b5c5edc0e5357986065c50bb00.tar.gz | |
MFH
| -rw-r--r-- | ext/mbstring/mbstring.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index ef277feb43..ca440766c8 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -3334,6 +3334,7 @@ PHP_FUNCTION(mb_get_info) } 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 @@ PHP_FUNCTION(mb_get_info) 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); |