diff options
| author | Anatol Belski <ab@php.net> | 2014-12-15 20:18:40 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-15 20:18:40 +0100 |
| commit | bd76a50019ca19eb3d5f5ca82de9af2095fadf69 (patch) | |
| tree | f04ea8df62d3e1791ceec1112f9180476960408a /ext/standard/array.c | |
| parent | f62ad3bc578eb7a5494b7816f31dc31227483aed (diff) | |
| parent | 4e48bff3ce88c7cfa614cfe21a8e069b6beafbb9 (diff) | |
| download | php-git-bd76a50019ca19eb3d5f5ca82de9af2095fadf69.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
Removed deprecated checks
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 998b568846..58bca29da8 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -3428,13 +3428,8 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int } /* copy the argument array */ - RETVAL_ZVAL(&args[0], 1, 0); - if (Z_ARRVAL_P(return_value) == &EG(symbol_table).ht) { - HashTable *old_ht = Z_ARRVAL_P(return_value); - - ZVAL_NEW_ARR(return_value); - zend_array_dup(Z_ARRVAL_P(return_value), old_ht); - } + ZVAL_NEW_ARR(return_value); + zend_array_dup(Z_ARRVAL_P(return_value), Z_ARRVAL(args[0])); /* go through the lists and look for common values */ while (Z_TYPE(ptrs[0]->val) != IS_UNDEF) { @@ -3851,13 +3846,8 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_ } /* copy the argument array */ - RETVAL_ZVAL(&args[0], 1, 0); - if (Z_ARRVAL_P(return_value) == &EG(symbol_table).ht) { - HashTable *old_ht = Z_ARRVAL_P(return_value); - - ZVAL_NEW_ARR(return_value); - zend_array_dup(Z_ARRVAL_P(return_value), old_ht); - } + ZVAL_NEW_ARR(return_value); + zend_array_dup(Z_ARRVAL_P(return_value), Z_ARRVAL(args[0])); /* go through the lists and look for values of ptr[0] that are not in the others */ while (Z_TYPE(ptrs[0]->val) != IS_UNDEF) { |