fix bug #47849 (Non-deep import loses the namespace)

add test

diff --git a/ext/dom/document.c b/ext/dom/document.c
index 44d8e3c041cd32bfb302ff69daf85cf3d9bcac1f..7390ba57b8f53c4c9a16c35dc427c35e063c10a5 100644 (file)
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -1198,6 +1198,9 @@ PHP_FUNCTION(dom_document_import_node)
        if (nodep->doc == docp) {
                retnodep = nodep;
        } else {
+               if ((recursive == 0) && (nodep->type == XML_ELEMENT_NODE)) {
+                       recursive = 2;
+               }
                retnodep = xmlDocCopyNode(nodep, docp, recursive);
                if (!retnodep) {
                        RETURN_FALSE;

diff --git a/ext/dom/tests/bug47849.phpt b/ext/dom/tests/bug47849.phpt
new file mode 100644 (file)
index 0000000..7e6b02c
--- /dev/null
+++ b/ext/dom/tests/bug47849.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #47849 (Non-deep import loses the namespace).
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php 
+
+$aDOM= new DOMDocument();
+$aDOM->appendChild($aDOM->createElementNS('urn::root','r:root'));
+
+$fromdom= new DOMDocument();
+$fromdom->loadXML('<data xmlns="urn::data">aaa</data>');
+
+$data= $fromdom->documentElement;
+$aDOM->documentElement->appendChild($aDOM->importNode($data));
+
+echo $aDOM->saveXML();
+
+?>
+--EXPECT--
+<?xml version="1.0"?>
+<r:root xmlns:r="urn::root"><data xmlns="urn::data"/></r:root>