diff options
| author | Xinchen Hui <laruence@php.net> | 2014-12-25 06:21:48 -0500 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-12-25 06:21:48 -0500 |
| commit | 898cae2e636e77c0e8adef0d9eed35bca838d950 (patch) | |
| tree | 7d041e4954eaa5afbda9ea4083e6ca4892160f0f | |
| parent | 3d4babdc2b03515fa30e382125a7e79d10bafe7e (diff) | |
| parent | 316f72ce28f345228cc76f7ce537d593d33df765 (diff) | |
| download | php-git-898cae2e636e77c0e8adef0d9eed35bca838d950.tar.gz | |
Merge branch 'PHP-5.6'
| -rw-r--r-- | ext/iconv/tests/iconv_basic_001.phpt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/iconv/tests/iconv_basic_001.phpt b/ext/iconv/tests/iconv_basic_001.phpt index 6fcb5dbe8a..079eb670e1 100644 --- a/ext/iconv/tests/iconv_basic_001.phpt +++ b/ext/iconv/tests/iconv_basic_001.phpt @@ -5,8 +5,10 @@ Rodrigo Prado de Jesus <royopa [at] gmail [dot] com> --SKIPIF-- <?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?> <?php if(substr(PHP_OS, 0, 3) == 'WIN' ) {die('skip not for windows');} ?> +<?php if(setlocale(LC_ALL, "en_US.utf8",) === false) { die('skip en_US.utf8 locales not available'); } ?> --FILE-- <?php +setlocale(LC_ALL, "en_US.utf8"); $in_charset = 'UTF-8'; $out_charset = 'ASCII//TRANSLIT'; $string_to_translate = 'Žluťoučký kůň\n'; |