com php-src: Removed deprecated checks: ext/standard/array.c

Commit: 4e48bff3ce88c7cfa614cfe21a8e069b6beafbb9 Author: Dmitry Stogov <dmitry@zend.com> Mon, 15 Dec 2014 16:42:28 +0300 Parents: 178363cbff9cc2366b75eb11fd61473da238f7c6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e48bff3ce88c7cfa614cfe21a8e069b6beafbb9 Log: Removed deprecated checks Changed paths: M ext/standard/array.c Diff: diff --git a/ext/standard/array.c b/ext/standard/array.c index 1f03e5a..83c00c9 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) {