Revert bogus fix for #47370.

diff --git a/NEWS b/NEWS
index b45d15076af18db8b397a9eb10d89cac887c7151..d33970c042c29a8d825ab9a14af9cc1bd71c9d04 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -14,7 +14,7 @@ PHP                                                                        NEWS
   properties and __get(). (Andrei)
 
 - Added optional sorting type flag parameter to array_unique(). Default is
-  SORT_STRING. (Andrei)
+  SORT_REGULAR. (Andrei)
 
 - Fixed a crash on extract in zip when files or directories entry names contain 
   a relative path. (Pierre)

diff --git a/ext/standard/array.c b/ext/standard/array.c
index bd3512f8b65547505d7ee864943ee5898f19bf68..4ed84a267b5468969a32d2dc40c64fdabdfce4c2 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2839,7 +2839,7 @@ PHP_FUNCTION(array_unique)
        };
        struct bucketindex *arTmp, *cmpdata, *lastkept;
        unsigned int i;
-       long sort_type = SORT_STRING;
+       long sort_type = SORT_REGULAR;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|l", &array, &sort_type) == FAILURE) {
                return;