Fix including in php5.

[xml-template] / php5 / xml-template.php

diff --git a/php5/xml-template.php b/php5/xml-template.php
index f69fbcaa082e7abb8234c70ce4957527332d4988..2a527d2184f513188fcdd694cafa1d027951b0c5 100644 (file)
--- a/php5/xml-template.php
+++ b/php5/xml-template.php
@@ -11,19 +11,19 @@ function XML_Template_process_file($filename, $obj, $clean = 1)
 function XML_Template_process($node, $obj, $clean = 1)
 {
        if (is_a($obj, 'DOMNode')) {                          # overwrite
-               for ($i = 0; $i < $node->childNodes->length; ++$i) {
-                       $child = $node->childNodes->item($i);
+               while ($node->childeNodes->length > 0) {
+                       $child = $node->childNodes->item(0);
                        $node->removeChild($child);
                }
 
                if (is_a($obj, 'DOMDocument')) {
-                       $obj = $obj->document_element();
+                       $obj = $obj->documentElement;
                }
 
-               $newobj = $obj->cloneNode(true);
-               $node->appendChild($newobj);
-
-               XML_Template_process($newobj, array(), $clean);
+               $frag = $node->ownerDocument->createDocumentFragment();
+               $frag->appendXML($obj->ownerDocument->saveXML($obj));
+               XML_Template_process($frag, array(), $clean);
+               $node->appendChild($frag);
        } else if (!is_array($obj)) {                         # overwrite
                for ($i = 0; $i < $node->childNodes->length; ++$i) {
                        $child = $node->childNodes->item($i);
@@ -78,10 +78,11 @@ function XML_Template_process($node, $obj, $clean = 1)
                }
        } else {                                                # repeat
                $doc = $node->ownerDocument;
-               $frag = $doc->createElement("temporary-fragment");    # ugh
+               $frag = $doc->createDocumentFragment();
 
                while ($node->childNodes->length > 0) {
                        $child = $node->childNodes->item(0);
+                       $node->removeChild($child);
                        $frag->appendChild($child);
                }
 
@@ -91,26 +92,12 @@ function XML_Template_process($node, $obj, $clean = 1)
                        }
 
                        $newnode = $frag->cloneNode(true);
-                       $node->appendChild($newnode);
                        XML_Template_process($newnode, $instance, $clean);
+                       $node->appendChild($newnode);
                        if ($clean) {
                                XML_Template_clean($newnode);
                        }
                }
-
-               # remove all the <fragment> tags
-               for ($i = 0; $i < $node->childNodes->length; ++$i) {
-                       $child = $node->childNodes->item($i);
-                       if ($child->localName != 'temporary-fragment') {
-                               continue;
-                       }
-                       while ($child->childNodes->length > 0) {
-                               $child2 = $child->childNodes->item(0);
-                               $node->appendChild($child2);
-                       }
-                       --$i;
-                       $node->removeChild($child);
-               }       
        }
 
        if ($clean) {