Index: branches/Ver3.0/xpressme_integration_kit/include/data.inc.php
===================================================================
--- branches/Ver3.0/xpressme_integration_kit/include/data.inc.php	(revision 744)
+++ branches/Ver3.0/xpressme_integration_kit/include/data.inc.php	(revision 749)
@@ -250,5 +250,5 @@
 if( ! function_exists( 'get_blog_option' ) ) {
 	function get_blog_option($option_table,$option_name){
-		$xoopsDB =& Database::getInstance();
+		global $xoopsDB;
 
 		$sql = "SELECT option_value FROM $option_table WHERE option_name = '" . $option_name . "'";
Index: branches/Ver3.0/xpressme_integration_kit/include/oninstall.php
===================================================================
--- branches/Ver3.0/xpressme_integration_kit/include/oninstall.php	(revision 744)
+++ branches/Ver3.0/xpressme_integration_kit/include/oninstall.php	(revision 749)
@@ -38,5 +38,4 @@
 	}
 
-	$db =& Database::getInstance() ;
 	$mid = $module->getVar('mid') ;
 
Index: branches/Ver3.0/xpressme_integration_kit/include/onuninstall.php
===================================================================
--- branches/Ver3.0/xpressme_integration_kit/include/onuninstall.php	(revision 744)
+++ branches/Ver3.0/xpressme_integration_kit/include/onuninstall.php	(revision 749)
@@ -9,4 +9,5 @@
 function xpress_onuninstall_base( $module , $mydirname )
 {
+	global $xoopsDB;
 	// transations on module uninstall
 
@@ -22,10 +23,9 @@
 	}
 
-	$db =& Database::getInstance() ;
 	$mid = $module->getVar('mid') ;
 	
 	$xp_prefix = preg_replace('/wordpress/','wp',$mydirname);
 	
-	$xoops_prefix = $db->prefix();
+	$xoops_prefix = $xoopsDB->prefix();
 
 	if (empty($xoops_prefix) || empty($xp_prefix)) {
Index: branches/Ver3.0/xpressme_integration_kit/include/onupdate.php
===================================================================
--- branches/Ver3.0/xpressme_integration_kit/include/onupdate.php	(revision 744)
+++ branches/Ver3.0/xpressme_integration_kit/include/onupdate.php	(revision 749)
@@ -21,5 +21,4 @@
 	}
 
-	$db =& Database::getInstance() ;
 	$mid = $module->getVar('mid') ;
 	
@@ -80,7 +79,6 @@
 if( ! function_exists( 'xpress_put_siteurl' ) ) :
 function xpress_put_siteurl($mydirname,$url){
-		global $xoopsModule;
+		global $xoopsModule,$xoopsDB;
 		$wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
-		$xoopsDB =& Database::getInstance();
 		$db_xpress_option = $xoopsDB->prefix($wp_prefix . '_options');
 
@@ -92,7 +90,6 @@
 if( ! function_exists( 'xpress_put_home' ) ) :
 function xpress_put_home($mydirname,$url){
-		global $xoopsModule;
+		global $xoopsModule,$xoopsDB;
 		$wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
-		$xoopsDB =& Database::getInstance();
 		$db_xpress_option = $xoopsDB->prefix($wp_prefix . '_options');
 
@@ -104,7 +101,6 @@
 if( ! function_exists( 'get_xpress_option' ) ) {
 	function get_xpress_option($mydirname,$option_name){
-		global $xoopsModule;
+		global $xoopsModule,$xoopsDB;
 		$wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
-		$xoopsDB =& Database::getInstance();
 		$option_table = $xoopsDB->prefix($wp_prefix . '_options');
 
@@ -135,7 +131,6 @@
 if( ! function_exists( 'get_db_version' ) ) :
 function get_db_version($mydirname){
-		global $xoopsModule;
+		global $xoopsModule,$xoopsDB;
 		$wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
-		$xoopsDB =& Database::getInstance();
 		$db_xpress_option = $xoopsDB->prefix($wp_prefix . '_options');
 
@@ -180,5 +175,5 @@
 function xpress_table_make($module, $mydirname)
 {
-	$db =& Database::getInstance() ;
+	global $xoopsDB;
 	$mid = $module->getVar('mid') ;
 
@@ -195,10 +190,10 @@
   		KEY post_id (post_id)
 		) TYPE=MyISAM";
-		$db->queryF( $queries ) ;
+		$xoopsDB->queryF( $queries ) ;
 		$msgs[] = "$views_table table of XPressME was made.";
 	} else {
 		if (!is_found_table_column($views_table,'blog_id')){
 			$queries ="ALTER TABLE $views_table ADD blog_id bigint(20)  FIRST";
-			$db->queryF( $queries ) ;
+			$xoopsDB->queryF( $queries ) ;
 			$msgs[] = "$views_table  ADD blog_id .";
 		}
@@ -206,18 +201,18 @@
 		// The table is repaired.
 		$non_blogid_sql ="SELECT * FROM $views_table WHERE blog_id IS NULL OR blog_id < 1";
-		$non_blogid_res = $db->query($non_blogid_sql, 0, 0);
-		while($row = $db->fetchArray($non_blogid_res)){
+		$non_blogid_res = $xoopsDB->query($non_blogid_sql, 0, 0);
+		while($row = $xoopsDB->fetchArray($non_blogid_res)){
 			$total_view = $row['post_views'];
 			$post_id = $row['post_id'];
 			$new_blogid_sql ="SELECT SUM(post_views) as post_views_sum FROM $views_table WHERE post_id = $post_id AND blog_id = 1 GROUP BY post_id";
-			$new_blogid_res = $db->query($new_blogid_sql, 0, 0);
-			if ($db->getRowsNum($new_blogid_res)  > 0){
-				$new_row = $db->fetchArray($new_blogid_res);
+			$new_blogid_res = $xoopsDB->query($new_blogid_sql, 0, 0);
+			if ($xoopsDB->getRowsNum($new_blogid_res)  > 0){
+				$new_row = $xoopsDB->fetchArray($new_blogid_res);
 				$total_view = $total_view + $new_row['post_views_sum'];
 				$del_sql = "DELETE FROM $views_table WHERE post_id = $post_id AND blog_id = 1";
-				$db->queryF( $del_sql ) ;
+				$xoopsDB->queryF( $del_sql ) ;
 			}
 			$update_sql = "UPDATE $views_table SET post_views = $total_view , blog_id = 1 WHERE post_id = $post_id AND (blog_id IS NULL OR blog_id < 1)";
-			$db->queryF( $update_sql ) ;
+			$xoopsDB->queryF( $update_sql ) ;
 		}
 	}
@@ -233,22 +228,22 @@
 	  		KEY post_id (post_id)
 			)TYPE=MyISAM";
-		$db->queryF( $queries ) ;
+		$xoopsDB->queryF( $queries ) ;
 		$msgs[] = "$d3forum_link table of XPressME was made.";
 	} else {
 		if (!is_found_table_column($d3forum_link,'forum_id')){
 			$queries ="ALTER TABLE $d3forum_link ADD forum_id bigint(20) unsigned NOT NULL default '0' AFTER wp_post_ID";
-			$db->queryF( $queries ) ;
+			$xoopsDB->queryF( $queries ) ;
 			$msgs[] = "$d3forum_link  ADD forum_id .";
 			// The table is repaired.
 //			$update_sql = "UPDATE $d3forum_link SET forum_id = 1 WHERE(forum_id IS NULL OR forum_id < 1)";
-//			$db->queryF( $update_sql ) ;
+//			$xoopsDB->queryF( $update_sql ) ;
 		}
 		if (!is_found_table_column($d3forum_link,'blog_id')){
 			$queries ="ALTER TABLE $d3forum_link ADD blog_id bigint(20)  unsigned NOT NULL default '0' AFTER forum_id";
-			$db->queryF( $queries ) ;
+			$xoopsDB->queryF( $queries ) ;
 			$msgs[] = "$d3forum_link  ADD blog_id .";
 			// The table is repaired.
 			$update_sql = "UPDATE $d3forum_link SET blog_id = 1 WHERE(blog_id IS NULL OR blog_id < 1)";
-			$db->queryF( $update_sql ) ;
+			$xoopsDB->queryF( $update_sql ) ;
 		}
 	}
@@ -266,17 +261,17 @@
 	  		KEY groupid (groupid)
 			)TYPE=MyISAM";
-		$db->queryF( $queries ) ;
+		$xoopsDB->queryF( $queries ) ;
 		$sql = "INSERT INTO $group_role (groupid, role) VALUES (1, 'administrator')";
-		$db->queryF( $sql ) ;
+		$xoopsDB->queryF( $sql ) ;
 		$msgs[] = "$group_role table of XPressME was made.";
 	} else {
 		if (!is_found_table_column($group_role,'blog_id')){
 			$queries ="ALTER TABLE $group_role ADD blog_id bigint(20)  AFTER groupid";
-			$db->queryF( $queries ) ;
+			$xoopsDB->queryF( $queries ) ;
 			$msgs[] = "$group_role  ADD blog_id .";
 		}
 		// The table is repaired.
 		$update_sql = "UPDATE $group_role SET blog_id = 1 WHERE(blog_id IS NULL OR blog_id < 1)";
-		$db->queryF( $update_sql ) ;
+		$xoopsDB->queryF( $update_sql ) ;
 	}
 	
@@ -295,5 +290,5 @@
 	  		KEY notify_reserve_id (notify_reserve_id)
 			)TYPE=MyISAM";
-		$db->queryF( $queries ) ;
+		$xoopsDB->queryF( $queries ) ;
 		$msgs[] = "$notify_reserve table of XPressME was made.";
 	}
@@ -304,7 +299,6 @@
 if( ! function_exists( 'enhanced_table_check' ) ) :
 function enhanced_table_check($mydirname,$table_name){
-		global $xoopsModule;
+		global $xoopsModule,$xoopsDB;
 		
-		$xoopsDB =& Database::getInstance();
 		$xpress_prefix = $xoopsDB->prefix(preg_replace('/wordpress/','wp',$mydirname) . '_');
 		$db_enhanced = $xpress_prefix . $table_name;
@@ -325,6 +319,5 @@
 if( ! function_exists( 'is_found_table_column' ) ) :
 function is_found_table_column($table,$column){
-		global $xoopsModule;
-		$xoopsDB =& Database::getInstance();
+		global $xoopsModule,$xoopsDB;
 
 		$sql = "DESCRIBE $table $column";
Index: branches/Ver3.0/xpressme_integration_kit/include/search.php
===================================================================
--- branches/Ver3.0/xpressme_integration_kit/include/search.php	(revision 744)
+++ branches/Ver3.0/xpressme_integration_kit/include/search.php	(revision 749)
@@ -107,5 +107,5 @@
 if( ! function_exists( 'get_blog_option' ) ) {
 	function get_blog_option($option_table,$option_name){
-		$xoopsDB =& Database::getInstance();
+		global $xoopsDB;
 
 		$sql = "SELECT option_value FROM $option_table WHERE option_name = '" . $option_name . "'";
Index: branches/Ver3.0/xpressme_integration_kit/include/sitemap.plugin.php
===================================================================
--- branches/Ver3.0/xpressme_integration_kit/include/sitemap.plugin.php	(revision 744)
+++ branches/Ver3.0/xpressme_integration_kit/include/sitemap.plugin.php	(revision 749)
@@ -62,7 +62,5 @@
 if(!function_exists('xpress_get_categoires_map')){
 	function xpress_get_categoires_map($blogs ,$disp_sub){
-		global $sitemap_configs;
-		
-		$xoopsDB =& Database::getInstance();
+		global $sitemap_configs,$xoopsDB;
 		
 		$sitemap = array();
@@ -150,5 +148,5 @@
 if( ! function_exists( 'get_blog_option' ) ) {
 	function get_blog_option($option_table,$option_name){
-		$xoopsDB =& Database::getInstance();
+		global $xoopsDB;
 
 		$sql = "SELECT option_value FROM $option_table WHERE option_name = '" . $option_name . "'";
Index: branches/Ver3.0/xpressme_integration_kit/include/wp_check.php
===================================================================
--- branches/Ver3.0/xpressme_integration_kit/include/wp_check.php	(revision 744)
+++ branches/Ver3.0/xpressme_integration_kit/include/wp_check.php	(revision 749)
@@ -1,7 +1,8 @@
 <?php
 	function is_wpdb_installed(){
+		global $xoopsDB;
 		$mydirname = basename(dirname( dirname( __FILE__ ) )) ;
-		$prefix_mod = XOOPS_DB_PREFIX .'_' . preg_replace('/wordpress/','wp',$mydirname) . '_';
-		$xoopsDB =& Database::getInstance();
+		
+		$prefix_mod = $xoopsDB->prefix(preg_replace('/wordpress/','wp',$mydirname) . '_');
 		$sql = "SHOW TABLES LIKE '$prefix_mod%'";
 		if ($result = $xoopsDB->queryf($sql)){
Index: branches/Ver3.0/xpressme_integration_kit/include/xpress_block_render.php
===================================================================
--- branches/Ver3.0/xpressme_integration_kit/include/xpress_block_render.php	(revision 744)
+++ branches/Ver3.0/xpressme_integration_kit/include/xpress_block_render.php	(revision 749)
@@ -46,4 +46,5 @@
 	function get_block_id($mydirname,$func_file,$options)
 	{
+		global $xoopsDB;
 		$options_string = '';
 		$mid = get_block_mid($mydirname);
@@ -52,5 +53,4 @@
 			$options_string .= $val;
 		}
-			$xoopsDB =& Database::getInstance();
 			$block_tbl = $xoopsDB->prefix('newblocks');	
 			$module_dir = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
@@ -67,5 +67,5 @@
 	function get_block_mid($mydirname)
 	{
-			$xoopsDB =& Database::getInstance();
+		global $xoopsDB;
 			$modules_tbl = $xoopsDB->prefix('modules');
 
@@ -81,8 +81,7 @@
 	function get_xpress_theme_name($mydirname)
 	{
-		global $wpdb;
+		global $wpdb,$xoopsDB;
 		
 		if (is_null($wpdb)){
-			$xoopsDB =& Database::getInstance();
 			$wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
 
@@ -305,8 +304,8 @@
     
     function get_xpress_mod_config($mydirname,$conf_name=''){
+    	global $xoopsDB;
 		$module_handler =& xoops_gethandler('module');
 		$xoopsModule =& $module_handler->getByDirname($mydirname);
 		$mid = $xoopsModule->getVar('mid');
-		$xoopsDB =& Database::getInstance();
 		$db_config = $xoopsDB->prefix('config');