com php-src: fixed whitespace depending (mis)behavior of var_dump'ing and print_r'ing SimpleXMLElements: ext/simplexml/simplexml.c
| From: | Anatol Belski | Date: | Fri, 29 May 2015 18:43:34 +0000 |
| Subject: | com php-src: fixed whitespace depending (mis)behavior of var_dump'ing and print_r'ing SimpleXMLElements: ext/simplexml/simplexml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86999@lists.php.net to get a copy of this message | ||
Commit: db4a6def475375986e40783824952118421e37db
Author: Christoph M. Becker <cmbecker69@gmx.de> Tue, 26 May 2015 18:35:09 +0200
Committer: Anatol Belski <ab@php.net> Fri, 29 May 2015 20:43:34 +0200
Parents: 1a3a674ee64e8174c54d5e33a3cee1f7125f35a7
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=db4a6def475375986e40783824952118421e37db
Log:
fixed whitespace depending (mis)behavior of var_dump'ing and print_r'ing SimpleXMLElements
Changed paths:
M ext/simplexml/simplexml.c
Diff:
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 7a9775b..18957d4 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1186,7 +1186,7 @@ static HashTable *sxe_get_prop_hash(zval *object, int is_debug) /* {{{ */
node = NULL;
} else if (sxe->iter.type != SXE_ITER_CHILD) {
- if ( !node->children || !node->parent || !node->next || node->children->next ||
node->children->children || node->parent->children == node->parent->last ) {
+ if ( sxe->iter.type == SXE_ITER_NONE || !node->children || !node->parent ||
node->children->next || node->children->children || node->parent->children ==
node->parent->last ) {
node = node->children;
} else {
ZVAL_COPY_VALUE(&iter_data, &sxe->iter.data);