Index: units/helpers/xml_helper5.php
===================================================================
--- units/helpers/xml_helper5.php	(revision 14001)
+++ units/helpers/xml_helper5.php	(working copy)
@@ -1,64 +1,76 @@
 <?php
 
-class XMLIterator implements Iterator 
+class XMLIterator implements Iterator
 {
 	private $var = array();
 
-  public function __construct($array)
-  {
-      if (is_array($array)) {
-          $this->var = $array;
-      }
-  }
+	public function __construct($array)
+	{
+		if ( is_array($array) ) {
+			$this->var = $array;
+		}
+	}
 
-  public function rewind() {
-      reset($this->var);
-  }
+	public function rewind()
+	{
+		reset($this->var);
+	}
 
-  public function current() {
-      $var = current($this->var);
-      return $var;
-  }
+	public function current()
+	{
+		$var = current($this->var);
+		return $var;
+	}
 
-  public function key() {
-      $var = key($this->var);
-      return $var;
-  }
+	public function key()
+	{
+		$var = key($this->var);
 
-  public function next() {
-      $var = next($this->var);
-      return $var;
-  }
+		return $var;
+	}
 
-  public function valid() {
-      $var = $this->current() !== false;
-      return $var;
-  }
-	
+	public function next()
+	{
+		$var = next($this->var);
+
+		return $var;
+	}
+
+	public function valid()
+	{
+		$var = $this->current() !== false;
+
+		return $var;
+	}
 }
 
 class kXMLNode5 extends kXMLNode implements IteratorAggregate {
 
-    public function getIterator() {
-        return new XMLIterator($this->Children);
+    public function getIterator()
+    {
+    	$ret = new XMLIterator($this->Children);
+
+        return $ret;
     }
-	
+
     public function __destruct()
     {
 //    	echo number_format(memory_get_usage()). ' &lt;-- Entered destructor for '.$this->Name.'<br/>';
-    	unset($this->Attributes);
-    	if (is_array($this->Children)) {
-	    	foreach ($this->Children as $key => $child)
-	    	{
-	    		if ($this->Children[$key] instanceof kXMLNode5 ) {
+    	unset($this->Attributes, $this->OriginalAttributes);
+
+    	if ( isset($this->Children) ) {
+	    	foreach ($this->Children as $key => $child) {
+	    		if ( $this->Children[$key] instanceof kXMLNode5 ) {
 	    			$this->Children[$key]->__destruct();
 	    		}
-	    		unset($this->Children[$key]);
+
+	    		unset( $this->Children[$key] );
 	    	}
     	}
+
     	unset($this->Children);
 //    	echo number_format(memory_get_usage()). ' &lt;-- Destructed '.$this->Name.' Children <br/>';
-    	unset($this->Name);
+    	unset($this->Name, $this->OriginalName);
     	unset($this->Data);
     	unset($this->firstChild);
     	unset($this->lastChild);