rrichards Tue Apr 7 15:32:13 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/dom/tests bug47849.phpt
Modified files:
/php-src/ext/dom document.c
Log:
MFH: fix bug #47849 (Non-deep import loses the namespace)
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.68.2.3.2.5.2.15&r2=1.68.2.3.2.5.2.16&diff_format=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.68.2.3.2.5.2.15
php-src/ext/dom/document.c:1.68.2.3.2.5.2.16
--- php-src/ext/dom/document.c:1.68.2.3.2.5.2.15 Fri Mar 13 13:43:29 2009
+++ php-src/ext/dom/document.c Tue Apr 7 15:32:12 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: document.c,v 1.68.2.3.2.5.2.15 2009/03/13 13:43:29 rrichards Exp $ */
+/* $Id: document.c,v 1.68.2.3.2.5.2.16 2009/04/07 15:32:12 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1196,6 +1196,9 @@
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;
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug47849.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/bug47849.phpt
+++ php-src/ext/dom/tests/bug47849.phpt
--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>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
