cvs: php-src /ext/standard array.c
| From: | Antony Dovgal | Date: | Thu, 02 Dec 2004 16:35:03 +0000 |
| Subject: | cvs: php-src /ext/standard array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-29388@lists.php.net to get a copy of this message | ||
tony2001 Thu Dec 2 11:35:03 2004 EDT
Modified files:
/php-src/ext/standard array.c
Log:
revert my previous patch as it breaks more than fixes
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.284&r2=1.285&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.284 php-src/ext/standard/array.c:1.285
--- php-src/ext/standard/array.c:1.284 Sun Nov 28 12:03:45 2004
+++ php-src/ext/standard/array.c Thu Dec 2 11:35:02 2004
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.284 2004/11/28 17:03:45 tony2001 Exp $ */
+/* $Id: array.c,v 1.285 2004/12/02 16:35:02 tony2001 Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -3650,7 +3650,6 @@
* 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. */