Changed array_subtract to array_diff

diff --git a/ext/standard/array.c b/ext/standard/array.c
index a4669e52e623bb38fd60a994c45bcb54b5b311bf..72462a245c4b18a2d1eff800103b146d1de2c637 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2291,10 +2291,10 @@ out:
 }
 /* }}} */
 
-/* {{{ proto array array_subtract(array arr1, array arr2 [, ...])
+/* {{{ proto array array_diff(array arr1, array arr2 [, ...])
    Returns the entries of arr1 that have values which are not present in
    any of the others arguments */
-PHP_FUNCTION(array_subtract)
+PHP_FUNCTION(array_diff)
 {
         zval ***args = NULL;
        HashTable *hash;

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 5d4baa16a02f3e7c1738dbd922018a0d63f01687..40eb1c2a6994d020368616762a4d8a9da9cd058f 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -509,7 +509,7 @@ function_entry basic_functions[] = {
        PHP_FE(array_rand,                                                              NULL)
        PHP_FE(array_unique,                                                    NULL)
        PHP_FE(array_intersect,                                                 NULL)
-       PHP_FE(array_subtract,                                                  NULL)
+       PHP_FE(array_diff,                                                          NULL)
 
        /* aliases from array.c */
        PHP_FALIAS(pos,                         current,                        first_arg_force_ref)

diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h
index b0d803e9eba53f6f4c2f1da6d629de591c66c419..3497b626fa0e614c1d2c7a49170b9b34b45d4126 100644 (file)
--- a/ext/standard/php_array.h
+++ b/ext/standard/php_array.h
@@ -71,7 +71,7 @@ PHP_FUNCTION(array_flip);
 PHP_FUNCTION(array_rand);
 PHP_FUNCTION(array_unique);
 PHP_FUNCTION(array_intersect);
-PHP_FUNCTION(array_subtract);
+PHP_FUNCTION(array_diff);
 
 HashTable* php_splice(HashTable *, int, int, zval ***, int, HashTable **);
 int multisort_compare(const void *a, const void *b);