Index: branches/Ver2.4/xpressme_integration_kit/include/data.inc.php
===================================================================
--- branches/Ver2.4/xpressme_integration_kit/include/data.inc.php	(revision 814)
+++ branches/Ver2.4/xpressme_integration_kit/include/data.inc.php	(revision 835)
@@ -250,5 +250,5 @@
 if( ! function_exists( 'get_blog_option' ) ) {
 	function get_blog_option($option_table,$option_name){
-		$xoopsDB =& Database::getInstance();
+		$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 
 		$sql = "SELECT option_value FROM $option_table WHERE option_name = '" . $option_name . "'";
Index: branches/Ver2.4/xpressme_integration_kit/include/oninstall.php
===================================================================
--- branches/Ver2.4/xpressme_integration_kit/include/oninstall.php	(revision 814)
+++ branches/Ver2.4/xpressme_integration_kit/include/oninstall.php	(revision 835)
@@ -35,5 +35,5 @@
 	}
 
-	$db =& Database::getInstance() ;
+	$db =& XoopsDatabaseFactory::getDatabaseConnection() ;
 	$mid = $module->getVar('mid') ;
 
Index: branches/Ver2.4/xpressme_integration_kit/include/onuninstall.php
===================================================================
--- branches/Ver2.4/xpressme_integration_kit/include/onuninstall.php	(revision 814)
+++ branches/Ver2.4/xpressme_integration_kit/include/onuninstall.php	(revision 835)
@@ -22,5 +22,5 @@
 	}
 
-	$db =& Database::getInstance() ;
+	$db =& XoopsDatabaseFactory::getDatabaseConnection() ;
 	$mid = $module->getVar('mid') ;
 	
Index: branches/Ver2.4/xpressme_integration_kit/include/onupdate.php
===================================================================
--- branches/Ver2.4/xpressme_integration_kit/include/onupdate.php	(revision 814)
+++ branches/Ver2.4/xpressme_integration_kit/include/onupdate.php	(revision 835)
@@ -21,5 +21,5 @@
 	}
 
-	$db =& Database::getInstance() ;
+	$db =& XoopsDatabaseFactory::getDatabaseConnection() ;
 	$mid = $module->getVar('mid') ;
 	
@@ -82,5 +82,5 @@
 		global $xoopsModule;
 		$wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
-		$xoopsDB =& Database::getInstance();
+		$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 		$db_xpress_option = $xoopsDB->prefix($wp_prefix . '_options');
 
@@ -94,5 +94,5 @@
 		global $xoopsModule;
 		$wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
-		$xoopsDB =& Database::getInstance();
+		$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 		$db_xpress_option = $xoopsDB->prefix($wp_prefix . '_options');
 
@@ -106,5 +106,5 @@
 		global $xoopsModule;
 		$wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
-		$xoopsDB =& Database::getInstance();
+		$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 		$option_table = $xoopsDB->prefix($wp_prefix . '_options');
 
@@ -137,5 +137,5 @@
 		global $xoopsModule;
 		$wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
-		$xoopsDB =& Database::getInstance();
+		$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 		$db_xpress_option = $xoopsDB->prefix($wp_prefix . '_options');
 
@@ -180,5 +180,5 @@
 function xpress_table_make($module, $mydirname)
 {
-	$db =& Database::getInstance() ;
+	$db =& XoopsDatabaseFactory::getDatabaseConnection() ;
 	$mid = $module->getVar('mid') ;
 
@@ -306,5 +306,5 @@
 		global $xoopsModule;
 		
-		$xoopsDB =& Database::getInstance();
+		$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 		$xpress_prefix = $xoopsDB->prefix(preg_replace('/wordpress/','wp',$mydirname) . '_');
 		$db_enhanced = $xpress_prefix . $table_name;
@@ -326,5 +326,5 @@
 function is_found_table_column($table,$column){
 		global $xoopsModule;
-		$xoopsDB =& Database::getInstance();
+		$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 
 		$sql = "DESCRIBE $table $column";
Index: branches/Ver2.4/xpressme_integration_kit/include/search.php
===================================================================
--- branches/Ver2.4/xpressme_integration_kit/include/search.php	(revision 814)
+++ branches/Ver2.4/xpressme_integration_kit/include/search.php	(revision 835)
@@ -107,5 +107,5 @@
 if( ! function_exists( 'get_blog_option' ) ) {
 	function get_blog_option($option_table,$option_name){
-		$xoopsDB =& Database::getInstance();
+		$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 
 		$sql = "SELECT option_value FROM $option_table WHERE option_name = '" . $option_name . "'";
Index: branches/Ver2.4/xpressme_integration_kit/include/sitemap.plugin.php
===================================================================
--- branches/Ver2.4/xpressme_integration_kit/include/sitemap.plugin.php	(revision 814)
+++ branches/Ver2.4/xpressme_integration_kit/include/sitemap.plugin.php	(revision 835)
@@ -64,5 +64,5 @@
 		global $sitemap_configs;
 		
-		$xoopsDB =& Database::getInstance();
+		$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 		
 		$sitemap = array();
@@ -150,5 +150,5 @@
 if( ! function_exists( 'get_blog_option' ) ) {
 	function get_blog_option($option_table,$option_name){
-		$xoopsDB =& Database::getInstance();
+		$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 
 		$sql = "SELECT option_value FROM $option_table WHERE option_name = '" . $option_name . "'";
Index: branches/Ver2.4/xpressme_integration_kit/include/xpress_block_render.php
===================================================================
--- branches/Ver2.4/xpressme_integration_kit/include/xpress_block_render.php	(revision 814)
+++ branches/Ver2.4/xpressme_integration_kit/include/xpress_block_render.php	(revision 835)
@@ -52,5 +52,5 @@
 			$options_string .= $val;
 		}
-			$xoopsDB =& Database::getInstance();
+			$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 			$block_tbl = $xoopsDB->prefix('newblocks');	
 			$module_dir = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
@@ -67,5 +67,5 @@
 	function get_block_mid($mydirname)
 	{
-			$xoopsDB =& Database::getInstance();
+			$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 			$modules_tbl = $xoopsDB->prefix('modules');
 
@@ -84,5 +84,5 @@
 		
 		if (is_null($wpdb)){
-			$xoopsDB =& Database::getInstance();
+			$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 			$wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
 
@@ -312,5 +312,5 @@
 		$xoopsModule =& $module_handler->getByDirname($mydirname);
 		$mid = $xoopsModule->getVar('mid');
-		$xoopsDB =& Database::getInstance();
+		$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 		$db_config = $xoopsDB->prefix('config');