From: Andrei Zmievski Date: Fri, 13 Feb 2009 22:26:46 +0000 (+0000) Subject: Revert bogus fix for #47370. X-Git-Tag: php-5.2.9RC3~27 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2d0db2a3a90e0bbd8acdec1d474dfde42b0d4f3;p=php Revert bogus fix for #47370. --- diff --git a/NEWS b/NEWS index b45d15076a..d33970c042 100644 --- 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 bd3512f8b6..4ed84a267b 100644 --- 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;