tony2001 Fri Nov 19 11:57:06 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard array.c
Log:
MFH: fix bug #30587 (array_multisort doesn't separate zvals before changing
them)
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.5&r2=1.266.2.6&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.266.2.5
php-src/ext/standard/array.c:1.266.2.6
--- php-src/ext/standard/array.c:1.266.2.5 Wed Sep 15 07:51:56 2004
+++ php-src/ext/standard/array.c Fri Nov 19 11:57:06 2004
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.266.2.5 2004/09/15 11:51:56 derick Exp $ */
+/* $Id: array.c,v 1.266.2.6 2004/11/19 16:57:06 tony2001 Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -3543,6 +3543,7 @@
* array, and the very first argument has to be an array.
*/
for (i = 0; i < argc; i++) {
+ SEPARATE_ZVAL(args[i]);
if (Z_TYPE_PP(args[i]) == IS_ARRAY) {
/* We see the next array, so we update the sort flags of
the previous array and reset the sort flags. */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
