[PHP-CVS] cvs: php-src /ext/spl spl_sxe.c

[Marcus Boerger]

helly           Sat Oct 29 16:38:01 2005 EDT

  Modified files:              
    /php-src/ext/spl    spl_sxe.c 
  Log:
  - Attribues don't have children
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_sxe.c?r1=1.13&r2=1.14&ty=u
Index: php-src/ext/spl/spl_sxe.c
diff -u php-src/ext/spl/spl_sxe.c:1.13 php-src/ext/spl/spl_sxe.c:1.14
--- php-src/ext/spl/spl_sxe.c:1.13      Mon Oct  3 12:04:50 2005
+++ php-src/ext/spl/spl_sxe.c   Sat Oct 29 16:37:59 2005
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: spl_sxe.c,v 1.13 2005/10/03 16:04:50 helly Exp $ */
+/* $Id: spl_sxe.c,v 1.14 2005/10/29 20:37:59 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -106,7 +106,7 @@
        php_sxe_object *child;
        xmlNodePtr      node;
 
-       if (!sxe->iter.data) {
+       if (!sxe->iter.data || sxe->iter.type == SXE_ITER_ATTRLIST) {
                RETURN_FALSE;
        }
        child = php_sxe_fetch_object(sxe->iter.data TSRMLS_CC);
@@ -128,7 +128,7 @@
 {
        php_sxe_object *sxe = php_sxe_fetch_object(getThis() TSRMLS_CC);
 
-       if (!sxe->iter.data) {
+       if (!sxe->iter.data || sxe->iter.type == SXE_ITER_ATTRLIST) {
                return; /* return NULL */
        }
        return_value->type = IS_OBJECT;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php