com php-src: Merge branch 'PHP-7.4': ext/intl/locale/locale_m ethods.c

From: Date: Fri, 31 May 2019 13:40:04 +0000
Subject: com php-src: Merge branch 'PHP-7.4': ext/intl/locale/locale_m ethods.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-106491@lists.php.net to get a copy of this message
Commit: f20b2c71e52d68ccf757daf01b4f8f19fd322cea Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 31 May 2019 15:40:04 +0200 Parents: 9585ab36149b81f5e89ec1826142c0197b0f9c39 8a8bc5c4529223ecf4f421b1bed03618f7394335 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f20b2c71e52d68ccf757daf01b4f8f19fd322cea Log: Merge branch 'PHP-7.4' Changed paths: MM ext/intl/locale/locale_methods.c Diff: diff --cc ext/intl/locale/locale_methods.c index 20a156a,4c5476f..17474df --- a/ext/intl/locale/locale_methods.c +++ b/ext/intl/locale/locale_methods.c @@@ -1514,8 -1538,9 +1514,8 @@@ PHP_FUNCTION(locale_lookup intl_error_reset( NULL ); - if(zend_parse_parameters( ZEND_NUM_ARGS(), "as|bS", &arr, &loc_range, &loc_range_len, + if(zend_parse_parameters( ZEND_NUM_ARGS(), "as|bS!", &arr, &loc_range, &loc_range_len, &boolCanonical, &fallback_loc_str) == FAILURE) { - intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "locale_lookup: unable to parse input params", 0 ); RETURN_FALSE; }

« previous php.cvs (#106491) next »