summaryrefslogtreecommitdiff
path: root/ext/intl/dateformat/dateformat_create.cpp
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2019-04-16 00:09:45 +0300
committerDmitry Stogov <dmitry@zend.com>2019-04-16 00:09:45 +0300
commit10aeed5be4da5344768f0cab9b1e46c756277efe (patch)
tree88c7191236940fd2ab37943c6feefcdd4a9c2ff6 /ext/intl/dateformat/dateformat_create.cpp
parent3f7bf35e169556f441e5840909261f1677fff640 (diff)
parent68842534616cd0ab29af4c1b8966c4ebf9900c2c (diff)
downloadphp-git-10aeed5be4da5344768f0cab9b1e46c756277efe.tar.gz
Merge branch 'PHP-7.4' of git.php.net:php-src into PHP-7.4
* 'PHP-7.4' of git.php.net:php-src: Remove not needed extension generated files gitignores Add test for curl_version() Fixed bug #77895 Zero sockaddr struct Fix saproxy_property_write signature Correctly destroy reference in ArrayObject sort
Diffstat (limited to 'ext/intl/dateformat/dateformat_create.cpp')
-rw-r--r--ext/intl/dateformat/dateformat_create.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/dateformat/dateformat_create.cpp b/ext/intl/dateformat/dateformat_create.cpp
index 9268b9ddf5..8c2b72a2da 100644
--- a/ext/intl/dateformat/dateformat_create.cpp
+++ b/ext/intl/dateformat/dateformat_create.cpp
@@ -70,7 +70,7 @@ static int datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor)
intl_error_reset(NULL);
object = return_value;
/* Parse parameters. */
- if (zend_parse_parameters_ex(zpp_flags, ZEND_NUM_ARGS(), "sll|zzs",
+ if (zend_parse_parameters_ex(zpp_flags, ZEND_NUM_ARGS(), "s!ll|zzs",
&locale_str, &locale_len, &date_type, &time_type, &timezone_zv,
&calendar_zv, &pattern_str, &pattern_str_len) == FAILURE) {
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_create: "