summaryrefslogtreecommitdiff
path: root/ext/intl/dateformat
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-04-15 15:27:37 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-04-15 15:27:37 +0200
commit2d7d5ab5c6484c6d3e16a8f15e5068ea0b0f566c (patch)
tree6b4cc3bd4d4e8443a9a85e6032dc9ba9bc6a3622 /ext/intl/dateformat
parentca8f563f994863abae6f5afe4fc27c84c1923bba (diff)
parenta2f3ec17770d3fc4f995356c27b75adcc70c2cc9 (diff)
downloadphp-git-2d7d5ab5c6484c6d3e16a8f15e5068ea0b0f566c.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
Diffstat (limited to 'ext/intl/dateformat')
-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: "