From: Rui Hirokawa <hirokawa@php.net>
Date: Sat, 11 Feb 2006 02:25:29 +0000 (+0000)
Subject: added additional info about mail encoding to mb_get_info(). (made by Jokagi)
X-Git-Tag: RELEASE_1_2~221
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0453023c3e86a3f4976598559667147d8db4f97b;p=php

added additional info about mail encoding to mb_get_info(). (made by Jokagi)
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index e6735db16e..fa11966112 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -3333,6 +3333,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);
@@ -3346,6 +3347,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);