helly Mon Feb 19 17:28:11 2007 UTC
Modified files:
/php-src/ext/standard var.c
Log:
- MFH Fixed bug #40465 (Ensure that all PHP elements are printed by var_dump)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.261&r2=1.262&diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.261 php-src/ext/standard/var.c:1.262
--- php-src/ext/standard/var.c:1.261 Fri Jan 19 22:19:39 2007
+++ php-src/ext/standard/var.c Mon Feb 19 17:28:11 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.261 2007/01/19 22:19:39 helly Exp $ */
+/* $Id: var.c,v 1.262 2007/02/19 17:28:11 helly Exp $ */
@@ -111,14 +111,6 @@
if (hash_key->nKeyLength==0) { /* numeric key */
php_printf("%*c[%ld]=>\n", level + 1, ' ', hash_key->h);
} else { /* string key */
- if (va_arg(args, int) &&
- ((hash_key->type == IS_STRING && hash_key->arKey.s[0] == 0)
||
- (hash_key->type == IS_UNICODE && hash_key->arKey.u[0] ==
0))) {
- /* XXX: perhaps when we are inside the class we should
permit access to
- * private & protected values
- */
- return 0;
- }
php_printf("%*c[", level + 1, ' ');
if (hash_key->type == IS_STRING) {
php_printf("\"");
@@ -233,7 +225,7 @@
php_element_dump_func = php_object_property_dump;
head_done:
if (myht) {
- zend_hash_apply_with_arguments(myht,
(apply_func_args_t) php_element_dump_func, 3, level, verbose, (Z_TYPE_PP(struc)
== IS_ARRAY ? 0 : 1));
+ zend_hash_apply_with_arguments(myht,
(apply_func_args_t) php_element_dump_func, 2, level, verbose);
if (is_temp) {
zend_hash_destroy(myht);
efree(myht);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
