cvs: php-src /ext/standard array.c
| From: | Antony Dovgal | Date: | Fri, 10 Aug 2007 12:54:38 +0000 |
| Subject: | cvs: php-src /ext/standard array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-45850@lists.php.net to get a copy of this message | ||
tony2001 Fri Aug 10 12:54:38 2007 UTC
Modified files:
/php-src/ext/standard array.c
Log:
allow empty prefix (restore 5_2 behavior)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.414&r2=1.415&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.414 php-src/ext/standard/array.c:1.415
--- php-src/ext/standard/array.c:1.414 Fri Aug 10 12:23:16 2007
+++ php-src/ext/standard/array.c Fri Aug 10 12:54:38 2007
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.414 2007/08/10 12:23:16 jani Exp $ */
+/* $Id: array.c,v 1.415 2007/08/10 12:54:38 tony2001 Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1417,7 +1417,7 @@
if (prefix) {
convert_to_text(prefix);
- if (!Z_UNILEN_P(prefix) || !php_valid_var_name(Z_UNIVAL_P(prefix), Z_UNILEN_P(prefix),
Z_TYPE_P(prefix))) {
+ if (Z_UNILEN_P(prefix) && !php_valid_var_name(Z_UNIVAL_P(prefix), Z_UNILEN_P(prefix),
Z_TYPE_P(prefix))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "prefix is not a valid identifier");
return;
}