Commit 7b0e2763 authored by William M. Brack's avatar William M. Brack
Browse files

a little further fixing of fallback processing, this time for fallback

* xinclude.c: a little further fixing of fallback processing, this
  time for fallback with children (bug 139520).
parent 29aa772d
Wed May 12 17:27:18 HKT 2004 William Brack <wbrack@mmm.com.hk>
* xinclude.c: a little further fixing of fallback processing, this
time for fallback with children (bug 139520).
Wed May 12 08:21:33 HKT 2004 William Brack <wbrack@mmm.com.hk>
 
* xmlschemas.c: added code in xmlSchemaBuildContentModel to
......
......@@ -2194,7 +2194,7 @@ xmlXIncludeDoProcess(xmlXIncludeCtxtPtr ctxt, xmlDocPtr doc, xmlNodePtr tree) {
cur = tree;
if (xmlXIncludeTestNode(ctxt, cur) == 1)
xmlXIncludePreProcessNode(ctxt, cur);
while (cur != NULL) {
while ((cur != NULL) && (cur != tree->parent)) {
/* TODO: need to work on entities -> stack */
if ((cur->children != NULL) &&
(cur->children->type != XML_ENTITY_DECL) &&
......@@ -2212,7 +2212,8 @@ xmlXIncludeDoProcess(xmlXIncludeCtxtPtr ctxt, xmlDocPtr doc, xmlNodePtr tree) {
break;
do {
cur = cur->parent;
if (cur == NULL) break; /* do */
if ((cur == NULL) || (cur == tree->parent))
break; /* do */
if (cur->next != NULL) {
cur = cur->next;
if (xmlXIncludeTestNode(ctxt, cur))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment