1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-30 22:43:14 +03:00

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
This commit is contained in:
Daniel Veillard
2003-07-06 17:35:43 +00:00
parent 598bec37b8
commit ffe4f5ec16
2 changed files with 10 additions and 1 deletions

View File

@ -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);