Commit ffe4f5ec authored by Daniel Veillard's avatar Daniel Veillard

fixed bug #116095 removing the error message when reapplying XInclude to a

* xinclude.c: fixed bug #116095 removing the error message when
  reapplying XInclude to a document.
Daniel
parent 598bec37
Sun Jul 6 19:34:17 CEST 2003 Daniel Veillard <daniel@veillard.com>
* xinclude.c: fixed bug #116095 removing the error message when
reapplying XInclude to a document.
Sat Jul 5 22:40:23 CEST 2003 Daniel Veillard <daniel@veillard.com>
* xmlIO.c: applied small changes to portability layer for
......
......@@ -1994,6 +1994,8 @@ static int
xmlXIncludeTestNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr node) {
if (node == NULL)
return(0);
if (node->type != XML_ELEMENT_NODE)
return(0);
if (node->ns == NULL)
return(0);
if (xmlStrEqual(node->ns->href, XINCLUDE_NS)) {
......@@ -2079,7 +2081,9 @@ xmlXIncludeDoProcess(xmlXIncludeCtxtPtr ctxt, xmlDocPtr doc) {
while (cur != NULL) {
/* TODO: need to work on entities -> stack */
if ((cur->children != NULL) &&
(cur->children->type != XML_ENTITY_DECL)) {
(cur->children->type != XML_ENTITY_DECL) &&
(cur->children->type != XML_XINCLUDE_START) &&
(cur->children->type != XML_XINCLUDE_END)) {
cur = cur->children;
if (xmlXIncludeTestNode(ctxt, cur))
xmlXIncludePreProcessNode(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