Add our own clone stuff when removing dummy elements, to avoid having PHP5

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

diff --git a/php5/xml-template.php b/php5/xml-template.php
index 5defe73b01e041b45fcd7134cf5e451d5d444419..46047ff8ff27730c09bdc5c91a4d91a6695b93e2 100644 (file)
--- a/php5/xml-template.php
+++ b/php5/xml-template.php
@@ -32,8 +32,13 @@ function XML_Template_process($node, $obj, $clean = 1)
                $node->appendChild($doc->createTextNode($obj));
        } else if (is_associative_array($obj)) {              # substitute
                $num_children = ($node->childNodes == null) ? 0 : $node->childNodes->length;
+               $children = array();
                for ($i = 0; $i < $num_children; ++$i) {
-                       $child = $node->childNodes->item($i);
+                       $children[] = $node->childNodes->item($i);
+               }
+
+               for ($i = 0; $i < $num_children; ++$i) {
+                       $child = $children[$i];
                        $processed = false;
 
                        if ($child->nodeType == XML_ELEMENT_NODE) {
@@ -134,7 +139,7 @@ function XML_Template_clean($node)
                while ($node->childNodes->length > 0) {
                        $child = $node->childNodes->item(0);
                        $node->removeChild($child);
-                       $parent->insertBefore($child, $node);
+                       $parent->insertBefore(own_clone_node($child, $doc), $node);
                }
                $parent->removeChild($node);
        }
@@ -202,7 +207,9 @@ function own_clone_element($node, $doc)
                        } else {
                                $attr2 = $doc->createAttribute($attr->localName);
                        }
-                       $attr2->value = $attr->value;
+
+                       # You've got to be kidding me...
+                       $attr2->value = htmlentities($attr->value);
                        $newnode->appendChild($attr2);
                }
        }