]> granicus.if.org Git - php/commitdiff
fixed whitespace dependend behavior of casting SimpleXMLElements to boolean
authorChristoph M. Becker <cmbecker69@gmx.de>
Tue, 26 May 2015 20:46:23 +0000 (22:46 +0200)
committerAnatol Belski <ab@php.net>
Fri, 29 May 2015 18:43:38 +0000 (20:43 +0200)
ext/simplexml/simplexml.c

index 18957d4fcba186a9575ede597883a9b156a9de4d..6bcf12ea86951c43386d6090bd6b60ec5a6e05c3 100644 (file)
@@ -1066,7 +1066,7 @@ static int sxe_prop_is_empty(zval *object) /* {{{ */
                if (node->type == XML_ATTRIBUTE_NODE) {
                        return 0;
                } 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);