diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-03-08 17:04:13 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-03-08 17:04:13 -0700 |
| commit | 876a9be3eeff618ad578143c38d2c302cd2dfc28 (patch) | |
| tree | bb1ce878a4d6f945984c8c2a10477fd9f048d7b8 | |
| parent | 90b8898d227d91fe1597d37914fb3de7bf786aec (diff) | |
| parent | 77dd2111f9608a81bb04385781f6c94d704a10e3 (diff) | |
| download | php-git-876a9be3eeff618ad578143c38d2c302cd2dfc28.tar.gz | |
Merge branch 'pull-request/1129'
* pull-request/1129:
Array - make krsort FAST_ZPP compatibility
| -rw-r--r-- | ext/standard/array.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index c63caddda8..e3f2a5d7cb 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -220,9 +220,17 @@ PHP_FUNCTION(krsort) zval *array; zend_long sort_type = PHP_SORT_REGULAR; +#ifndef FAST_ZPP if (zend_parse_parameters(ZEND_NUM_ARGS(), "a/|l", &array, &sort_type) == FAILURE) { RETURN_FALSE; } +#else + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_ARRAY_EX(array, 0, 1) + Z_PARAM_OPTIONAL + Z_PARAM_LONG(sort_type) + ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE); +#endif php_set_compare_func(sort_type); |