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";
