diff options
| author | Rui Hirokawa <hirokawa@php.net> | 2008-02-16 12:42:08 +0000 |
|---|---|---|
| committer | Rui Hirokawa <hirokawa@php.net> | 2008-02-16 12:42:08 +0000 |
| commit | 3a9363d0d86f522963bbd9b4cc77b6d5f27bad11 (patch) | |
| tree | 424cfae5cd0f1a4a3ec4afc3b57859a14d92ea46 | |
| parent | 67947770dc8812462220fb623c8f1705095c98ce (diff) | |
| download | php-git-3a9363d0d86f522963bbd9b4cc77b6d5f27bad11.tar.gz | |
revert commit.
| -rw-r--r-- | ext/mbstring/libmbfl/nls/nls_hy.c | 2 | ||||
| -rw-r--r-- | ext/mbstring/mbstring.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/ext/mbstring/libmbfl/nls/nls_hy.c b/ext/mbstring/libmbfl/nls/nls_hy.c index 1c4b383510..a2511484cd 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 0c6eca8801..f49aeee567 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -971,8 +971,6 @@ 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; |