diff options
| -rw-r--r-- | ext/mbstring/libmbfl/nls/nls_hy.c | 2 | ||||
| -rw-r--r-- | ext/mbstring/mbstring.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 f49aeee567..0c6eca8801 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -971,6 +971,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; |