From b0a94e8bfaaa726a1ca823989d28201ccaf6f90f Mon Sep 17 00:00:00 2001 From: "William M. Brack" Date: Wed, 18 Jul 2007 18:04:55 +0000 Subject: [PATCH] applied patch from bug #454608 from Patrik Fimml. Fixes bug #454608. * xinclude.c: applied patch from bug #454608 from Patrik Fimml. Fixes bug #454608. svn path=/trunk/; revision=3644 --- ChangeLog | 5 +++++ xinclude.c | 13 +------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05ef347f..3e71bdff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jul 18 11:05:08 PDT 2007 William Brack + + * xinclude.c: applied patch from bug #454608 from Patrik Fimml. + Fixes bug #454608. + Wed Jul 11 19:57:59 CEST 2007 Daniel Veillard * xmlschemas.c: applied patch for xsi:nil from Frank Gross, this diff --git a/xinclude.c b/xinclude.c index 34a5489a..31ea0267 100644 --- a/xinclude.c +++ b/xinclude.c @@ -1606,6 +1606,7 @@ loaded: if (set->nodeTab[i] == NULL) continue; switch (set->nodeTab[i]->type) { + case XML_ELEMENT_NODE: case XML_TEXT_NODE: case XML_CDATA_SECTION_NODE: case XML_ENTITY_REF_NODE: @@ -1618,18 +1619,6 @@ loaded: case XML_DOCB_DOCUMENT_NODE: #endif continue; - case XML_ELEMENT_NODE: { - xmlChar *nodeBase; - xmlNodePtr el = set->nodeTab[i]; - - nodeBase = xmlNodeGetBase(el->doc, el); - if (nodeBase != NULL) { - if (!xmlStrEqual(nodeBase, el->doc->URL)) - xmlNodeSetBase(el, nodeBase); - xmlFree(nodeBase); - } - continue; - } case XML_ATTRIBUTE_NODE: xmlXIncludeErr(ctxt, ctxt->incTab[nr]->ref,