From: Rui Hirokawa <hirokawa@php.net>
Date: Sat, 16 Feb 2008 08:49:07 +0000 (+0000)
Subject: MFB
X-Git-Tag: RELEASE_2_0_0a1~454
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe1484dc5096d795eb0ce1da90f8dd8c70ec2a66;p=php

MFB
---

diff --git a/ext/mbstring/libmbfl/nls/nls_hy.c b/ext/mbstring/libmbfl/nls/nls_hy.c
index a2511484cd..1c4b383510 100644
--- a/ext/mbstring/libmbfl/nls/nls_hy.c
+++ b/ext/mbstring/libmbfl/nls/nls_hy.c
@@ -11,7 +11,7 @@
 
 const mbfl_language mbfl_language_armenian = {
 	mbfl_no_language_armenian ,
-	"Armenian ",
+	"Armenian",
 	"hy",
 	NULL,
 	mbfl_no_encoding_armscii8,
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 011f2ba353..d62f1df5e0 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -892,6 +892,8 @@ PHP_RINIT_FUNCTION(mbstring)
 	const struct mb_overload_def *p;
 
 	MBSTRG(current_language) = MBSTRG(language);
+	php_mb_nls_get_default_detect_order_list(MBSTRG(language), 
+        &MBSTRG(default_detect_order_list), &MBSTRG(default_detect_order_list_size));
 
 	if (MBSTRG(internal_encoding) == mbfl_no_encoding_invalid) {
 		char *default_enc = NULL;