MFB

diff --git a/ext/mbstring/libmbfl/nls/nls_hy.c b/ext/mbstring/libmbfl/nls/nls_hy.c
index a2511484cd0fdd513ed55dd6761ef87552dc5163..1c4b383510128f830075c8338f427ad047f7c5f6 100644 (file)
--- 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 011f2ba35353e5f42eca0f5a6e9cd94b0a18d0bb..d62f1df5e0abd03352f6d510797c45807c60350e 100644 (file)
--- 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;