From: sgunderson@bigfoot.com <>
Date: Mon, 21 Apr 2008 20:08:05 +0000 (+0200)
Subject: More cloning fixes for php5.
X-Git-Url: https://git.sesse.net/?p=xml-template;a=commitdiff_plain;h=09466bbbd0bc3ef172480ff2b50a5bbb775c968c

More cloning fixes for php5.
---

diff --git a/php5/xml-template.php b/php5/xml-template.php
index b6f4041..7ae6dcb 100644
--- a/php5/xml-template.php
+++ b/php5/xml-template.php
@@ -10,13 +10,13 @@ function XML_Template_process_file($filename, $obj, $clean = 1)
 
 function XML_Template_process($node, $obj, $clean = 1)
 {
-	if (is_a($obj, 'domnode')) {                          # overwrite
+	if (is_a($obj, 'DOMNode')) {                          # overwrite
 		for ($i = 0; $i < $node->childNodes->length; ++$i) {
 			$child = $node->childNodes->item($i);
 			$node->removeChild($child);
 		}
 
-		if (is_a($obj, 'domdocument')) {
+		if (is_a($obj, 'DOMDocument')) {
 			$obj = $obj->document_element();
 		}
 
@@ -39,8 +39,9 @@ function XML_Template_process($node, $obj, $clean = 1)
 			if ($child->nodeType == XML_ELEMENT_NODE) {
 				unset($id);
 
-				$tag = $child->nodeName;
+				$tag = $child->localName;
 				$attrs = $child->attributes;
+
 				if (isset($attrs)) {
 					foreach ($child->attributes as $attr) {
 						if ($attr->namespaceURI == 'http://template.sesse.net/' && $attr->name == 'id') {
@@ -58,7 +59,7 @@ function XML_Template_process($node, $obj, $clean = 1)
 					# FIXME: we would want something like \Q and \E here...
 					if (preg_match('/^' . $tag . '\/(.*)$/', $key, $matches) ||
 					    (isset($id) && preg_match('/^#' . $id . '\/(.*)$/', $key, $matches))) {
-					    	$child->set_attribute($matches[1], $obj[$key]);
+					    	$child->setAttribute($matches[1], $obj[$key]);
 					}
 
 					if ($processed) {
@@ -101,7 +102,7 @@ function XML_Template_process($node, $obj, $clean = 1)
 
 		for ($i = 0; $i < $node->childNodes->length; ++$i) {
 			$child = $node->childNodes->item($i);
-			if ($child->name != 'temporary-fragment') {
+			if ($child->localName != 'temporary-fragment') {
 				continue;
 			}
 			for ($j = 0; $j < $child->childNodes->length; ++$j) {
@@ -128,10 +129,11 @@ function XML_Template_clean($node)
 		# after we've done any required replacements
 		$doc = $node->ownerDocument;
 		$parent = $node->parentNode;
-		for ($i = 0; $i < $node->childNodes->length; ++$i) {
-			$child = $node->childNodes->item($i);
+
+		while ($node->childNodes->length > 0) {
+			$child = $node->childNodes->item(0);
 			$node->removeChild($child);
-			$node->insert_before($child, $node);
+			$parent->insertBefore($child, $node);
 		}
 		$parent->removeChild($node);
 	}