diff options
| author | Remi Collet <remi@php.net> | 2017-06-13 08:50:10 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-06-13 08:50:10 +0200 |
| commit | 90f33b1ac733771f0e6b7480efa96879f5f488e9 (patch) | |
| tree | 0e927d9a2cf139d2f2d9971edcd80f8c4aaaab47 /ext/intl/php_intl.c | |
| parent | 593d37376b272f990a3007957a037b57e570216e (diff) | |
| parent | c4d7cfa53631dcfb5e4dd3b736324ad3d15f2f59 (diff) | |
| download | php-git-90f33b1ac733771f0e6b7480efa96879f5f488e9.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
NEWS
Fix bug #74705 for collator_get_sort_key
Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
Diffstat (limited to 'ext/intl/php_intl.c')
| -rw-r--r-- | ext/intl/php_intl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index 69e62ca301..dc364678ac 100644 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -639,7 +639,7 @@ zend_function_entry intl_functions[] = { PHP_FE( collator_get_locale, collator_1_arg ) PHP_FE( collator_get_error_code, collator_0_args ) PHP_FE( collator_get_error_message, collator_0_args ) - PHP_FE( collator_get_sort_key, collator_2_args ) + PHP_FE( collator_get_sort_key, collator_1_arg ) /* formatter functions */ PHP_FE( numfmt_create, arginfo_numfmt_create ) |