cvs: php-src(PHP_5_3) /ext/simplexml simplexml.c /ext/simplexml/tests bug46048.phpt

davidc Tue Feb 3 21:42:36 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/simplexml/tests bug46048.phpt Modified files: /php-src/ext/simplexml simplexml.c Log: - Fixed Bug #46048 (SimpleXML top-level @attributes not part of iterator) - Added test for bug #46048 http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.30&r2=1.151.2.22.2.35.2.31&diff_format=u Index: php-src/ext/simplexml/simplexml.c diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.30 php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.31 --- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.30 Wed Dec 31 11:15:43 2008 +++ php-src/ext/simplexml/simplexml.c Tue Feb 3 21:42:35 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simplexml.c,v 1.151.2.22.2.35.2.30 2008/12/31 11:15:43 sebastian Exp $ */ +/* $Id: simplexml.c,v 1.151.2.22.2.35.2.31 2009/02/03 21:42:35 davidc Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1087,7 +1087,7 @@ if (!node) { return rv; } - if (is_debug) { + if (is_debug || sxe->iter.type != SXE_ITER_CHILD) { if (sxe->iter.type == SXE_ITER_ELEMENT) { node = php_sxe_get_first_node(sxe, node TSRMLS_CC); } @@ -2555,7 +2555,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "Simplexml support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.35.2.30 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.35.2.31 $"); php_info_print_table_row(2, "Schema support", #ifdef LIBXML_SCHEMAS_ENABLED "enabled"); http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug46048.phpt?view=markup&rev=1.1 Index: php-src/ext/simplexml/tests/bug46048.phpt +++ php-src/ext/simplexml/tests/bug46048.phpt