Index: /trunk/include/xml.php
===================================================================
--- /trunk/include/xml.php	(revision 41)
+++ /trunk/include/xml.php	(revision 42)
@@ -14,7 +14,7 @@
 # and returns an equivalent PHP data structure
 ###################################################################################
-if( ! function_exists( 'XML_unserialize' ) ) : // d3pipe Used function
-function & XML_unserialize(&$xml){
-	$xml_parser = &new XML();
+if( ! function_exists( 'xpress_XML_unserialize' ) ) : // d3pipe Used function
+function & xpress_XML_unserialize(&$xml){
+	$xml_parser = &new xpress_XML();
 	$data = &$xml_parser->parse($xml);
 	$xml_parser->destruct();
@@ -26,6 +26,6 @@
 # Takes one parameter: the data to serialize. Must be an array.
 ###################################################################################
-if( ! function_exists( 'XML_serialize' ) ) : // d3pipe Used function
-function & XML_serialize(&$data, $level = 0, $prior_key = NULL){
+if( ! function_exists( 'xpress_XML_serialize' ) ) : // d3pipe Used function
+function & xpress_XML_serialize(&$data, $level = 0, $prior_key = NULL){
 	if($level == 0){ ob_start(); echo '<?xml version="1.0" ?>',"\n"; }
 	while(list($key, $value) = each($data))
@@ -35,5 +35,5 @@
 
 			if(is_array($value) and array_key_exists(0, $value)){
-				XML_serialize($value, $level, $key);
+				xpress_XML_serialize($value, $level, $key);
 			}else{
 				$tag = $prior_key ? $prior_key : $key;
@@ -47,5 +47,5 @@
 				if(is_null($value)) echo " />\n";
 				elseif(!is_array($value)) echo '>',htmlspecialchars($value),"</$tag>\n";
-				else echo ">\n",XML_serialize($value, $level+1),str_repeat("\t", $level),"</$tag>\n";
+				else echo ">\n",xpress_XML_serialize($value, $level+1),str_repeat("\t", $level),"</$tag>\n";
 			}
 	reset($data);
@@ -56,5 +56,5 @@
 # XML class: utility class to be used with PHP's XML handling functions
 ###################################################################################
-class XML{
+class xpress_XML{
 	var $parser;   #a reference to the XML parser
 	var $document; #the entire XML structure built up so far
@@ -63,5 +63,5 @@
 	var $last_opened_tag; #keeps track of the last tag opened.
 
-	function XML(){
+	function xpress_XML(){
  		// $this->parser = &xml_parser_create();
  		$this->parser = xml_parser_create(); // GIJ
@@ -95,5 +95,5 @@
 			if(is_array($this->parent[$tag]) and array_key_exists(0,$this->parent[$tag])){ #if the keys are numeric
 				#this is the third or later instance of $tag we've come across
-				$key = count_numeric_items($this->parent[$tag]);
+				$key = xpress_count_numeric_items($this->parent[$tag]);
 			}else{
 				#this is the second instance of $tag that we've seen. shift around
@@ -129,6 +129,6 @@
 }
 
-if( ! function_exists( 'count_numeric_items' ) ) : // d3pipe Used function
-function count_numeric_items(&$array){
+if( ! function_exists( 'xpress_count_numeric_items' ) ) : // d3pipe Used function
+function xpress_count_numeric_items(&$array){
 	return is_array($array) ? count(array_filter(array_keys($array), 'is_numeric')) : 0;
 }
Index: /trunk/include/xoops_block_cache.php
===================================================================
--- /trunk/include/xoops_block_cache.php	(revision 41)
+++ /trunk/include/xoops_block_cache.php	(revision 42)
@@ -5,5 +5,5 @@
 	function xpress_block_cache_write($mydirname,$block_name,$block)
 	{
-			$xml = XML_serialize($block);
+			$xml = xpress_XML_serialize($block);
 			$xml_name = $block_name . '.xml';
 			xpress_cache_write($mydirname,$xml_name,$xml);
@@ -13,5 +13,5 @@
 			$xml_name = $block_name . '.xml';
 			$xml_data = xpress_cache_read($mydirname,$xml_name);
-			return @XML_unserialize($xml_data);
+			return @xpress_XML_unserialize($xml_data);
 	}
 ?>