diff options
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 07db375440..970735cf47 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2788,7 +2788,7 @@ PHP_FUNCTION(array_unshift) Z_ARRVAL_P(stack)->nNextFreeElement = new_hash.nNextFreeElement; Z_ARRVAL_P(stack)->arData = new_hash.arData; Z_ARRVAL_P(stack)->pDestructor = new_hash.pDestructor; - + zend_hash_internal_pointer_reset(Z_ARRVAL_P(stack)); /* Clean up and return the number of elements in the stack */ @@ -3229,7 +3229,7 @@ static inline void php_array_merge_or_replace_wrapper(INTERNAL_FUNCTION_PARAMETE } /* }}} */ -/* {{{ proto array array_merge(array arr1, array arr2 [, array ...]) +/* {{{ proto array array_merge(array arr1 [, array ...]) Merges elements from passed arrays into one array */ PHP_FUNCTION(array_merge) { @@ -3237,7 +3237,7 @@ PHP_FUNCTION(array_merge) } /* }}} */ -/* {{{ proto array array_merge_recursive(array arr1, array arr2 [, array ...]) +/* {{{ proto array array_merge_recursive(array arr1 [, array ...]) Recursively merges elements from passed arrays into one array */ PHP_FUNCTION(array_merge_recursive) { @@ -3245,7 +3245,7 @@ PHP_FUNCTION(array_merge_recursive) } /* }}} */ -/* {{{ proto array array_replace(array arr1, array arr2 [, array ...]) +/* {{{ proto array array_replace(array arr1 [, array ...]) Replaces elements from passed arrays into one array */ PHP_FUNCTION(array_replace) { @@ -3253,7 +3253,7 @@ PHP_FUNCTION(array_replace) } /* }}} */ -/* {{{ proto array array_replace_recursive(array arr1, array arr2 [, array ...]) +/* {{{ proto array array_replace_recursive(array arr1 [, array ...]) Recursively replaces elements from passed arrays into one array */ PHP_FUNCTION(array_replace_recursive) { @@ -4099,7 +4099,7 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int ZVAL_UNDEF(&list->val); if (hash->nNumOfElements > 1) { if (behavior == INTERSECT_NORMAL) { - zend_sort((void *) lists[i], hash->nNumOfElements, + zend_sort((void *) lists[i], hash->nNumOfElements, sizeof(Bucket), intersect_data_compare_func, (swap_func_t)zend_hash_bucket_swap); } else if (behavior & INTERSECT_ASSOC) { /* triggered also when INTERSECT_KEY */ zend_sort((void *) lists[i], hash->nNumOfElements, |