derick Fri Dec 17 09:38:46 2004 EDT
Added files: (Branch: PHP_4_3)
/php-src/ext/standard/tests/array var_export2.phpt
Modified files:
/php-src NEWS
/php-src/ext/standard var.c
Log:
- Fixed bug #31072 (var_export() does not output an array element with an
empty
string key). (Derick)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.777&r2=1.1247.2.778&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.777 php-src/NEWS:1.1247.2.778
--- php-src/NEWS:1.1247.2.777 Thu Dec 16 21:20:04 2004
+++ php-src/NEWS Fri Dec 17 09:38:43 2004
@@ -4,6 +4,8 @@
- Fixed bug #31111 (Compile failure of zend_strtod.c). (Derick)
- Fixed bug #31110 (PHP 4.3.10 does not compile on Tru64 UNIX 5.1B). (Derick)
- Fixed bug #31107 (Compile failure on Solaris 9 (Intel) and gcc 3.4.3).
(Derick)
+- Fixed bug #31072 (var_export() does not output an array element with an empty
+ string key). (Derick)
- Fixed bug #31056 (php_std_date() returns invalid formatted date if
y2k_compliance is On). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/standard/var.c?r1=1.150.2.16&r2=1.150.2.17&ty=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.150.2.16
php-src/ext/standard/var.c:1.150.2.17
--- php-src/ext/standard/var.c:1.150.2.16 Fri Oct 8 15:03:14 2004
+++ php-src/ext/standard/var.c Fri Dec 17 09:38:45 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.150.2.16 2004/10/08 19:03:14 helly Exp $ */
+/* $Id: var.c,v 1.150.2.17 2004/12/17 14:38:45 derick Exp $ */
/* {{{ includes
@@ -267,17 +267,13 @@
if (hash_key->nKeyLength==0) { /* numeric key */
php_printf("%*c%ld => ", level + 1, ' ', hash_key->h);
} else { /* string key */
- if (va_arg(args, int) && hash_key->arKey[0] == '\0') {
- return 0;
- } else {
- char *key;
- int key_len;
- key = php_addcslashes(hash_key->arKey,
hash_key->nKeyLength - 1, &key_len, 0, "'\\", 2 TSRMLS_CC);
- php_printf("%*c'", level + 1, ' ');
- PHPWRITE(key, key_len);
- php_printf("' => ");
- efree(key);
- }
+ char *key;
+ int key_len;
+ key = php_addcslashes(hash_key->arKey, hash_key->nKeyLength -
1, &key_len, 0, "'\\", 2 TSRMLS_CC);
+ php_printf("%*c'", level + 1, ' ');
+ PHPWRITE(key, key_len);
+ php_printf("' => ");
+ efree(key);
}
php_var_export(zv, level + 2 TSRMLS_CC);
PUTS (",\n");
http://cvs.php.net/co.php/php-src/ext/standard/tests/array/var_export2.phpt?r=1.1&p=1
Index: php-src/ext/standard/tests/array/var_export2.phpt
+++ php-src/ext/standard/tests/array/var_export2.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
