andrei Fri Feb 13 22:26:47 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard array.c
/php-src NEWS
Log:
Revert bogus fix for #47370.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.64&r2=1.308.2.21.2.65&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.64
php-src/ext/standard/array.c:1.308.2.21.2.65
--- php-src/ext/standard/array.c:1.308.2.21.2.64 Thu Feb 12 18:30:31 2009
+++ php-src/ext/standard/array.c Fri Feb 13 22:26:46 2009
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.21.2.64 2009/02/12 18:30:31 moriyoshi Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.65 2009/02/13 22:26:46 andrei Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2839,7 +2839,7 @@
};
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;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1416&r2=1.2027.2.547.2.1417&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1416 php-src/NEWS:1.2027.2.547.2.1417
--- php-src/NEWS:1.2027.2.547.2.1416 Thu Feb 12 20:32:17 2009
+++ php-src/NEWS Fri Feb 13 22:26:46 2009
@@ -14,7 +14,7 @@
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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
