From: Seiji Masugata <masugata@php.net>
Date: Thu, 24 Aug 2006 16:51:00 +0000 (+0000)
Subject: added returned value in mb_get_info( ).
X-Git-Tag: RELEASE_1_0_0RC1~1887
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf90bc9e1cf2f69cb91b9ce56bcff2b4eb9246d5;p=php

added returned value in mb_get_info( ).
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index a23766a98e..4056d72c54 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -3792,6 +3792,7 @@ PHP_FUNCTION(mb_get_info)
 		if ((name = (char *)mbfl_no_encoding2name(MBSTRG(current_http_output_encoding))) != NULL) {
 			add_assoc_string(return_value, "http_output", name, 1);
 		}
+		add_assoc_long(return_value, "func_overload", MBSTRG(func_overload));
 		if (MBSTRG(func_overload)){
 			over_func = &(mb_ovld[0]);
 			MAKE_STD_ZVAL(row1);
@@ -3802,9 +3803,9 @@ PHP_FUNCTION(mb_get_info)
 				}
 				over_func++;
 			}
-			add_assoc_zval(return_value, "func_overload", row1);
+			add_assoc_zval(return_value, "func_overload_list", row1);
 		} else {
-			add_assoc_string(return_value, "func_overload", "no overload", 1);
+			add_assoc_string(return_value, "func_overload_list", "no overload", 1);
  		}
 		if (lang != NULL) {
 			if ((name = (char *)mbfl_no_encoding2name(lang->mail_charset)) != NULL) {
@@ -3881,6 +3882,8 @@ PHP_FUNCTION(mb_get_info)
 			RETVAL_STRING(name, 1);
 		}		
 	} else if (!strcasecmp("func_overload", typ)) {
+ 		RETVAL_LONG(MBSTRG(func_overload));
+	} else if (!strcasecmp("func_overload_list", typ)) {
 		if (MBSTRG(func_overload)){
 				over_func = &(mb_ovld[0]);
 				array_init(return_value);