Index: branches/Ver2.4/xpressme_integration_kit/class/xpressD3commentContent.class.php
===================================================================
--- branches/Ver2.4/xpressme_integration_kit/class/xpressD3commentContent.class.php	(revision 811)
+++ branches/Ver2.4/xpressme_integration_kit/class/xpressD3commentContent.class.php	(revision 835)
@@ -11,5 +11,5 @@
 			global $forum_id;
 			
-			$db =& Database::getInstance() ;
+			$db =& XoopsDatabaseFactory::getDatabaseConnection() ;
 			$myts =& MyTextsanitizer::getInstance() ;
 
@@ -80,5 +80,5 @@
 				}
 			}
-					$db =& Database::getInstance() ;
+					$db =& XoopsDatabaseFactory::getDatabaseConnection() ;
 					$myts =& MyTextsanitizer::getInstance() ;
 
@@ -181,5 +181,5 @@
 			$xpress_prefix = preg_replace('/wordpress/','wp',$mydirname);
 			$blog_info = $this->get_comment_blog_info($forum_id);		
-			$db =& Database::getInstance() ;
+			$db =& XoopsDatabaseFactory::getDatabaseConnection() ;
 			
 			list( $count ) = $db->fetchRow( $db->query( "SELECT COUNT(*) FROM ".$blog_info['mb_table_prefix'] ."posts WHERE ID=$post_id AND comment_status ='open'" ) ) ;
@@ -209,5 +209,5 @@
 			$wp_full_prefix = $blog_info['mb_table_prefix'];
 
-			$db =& Database::getInstance() ;
+			$db =& XoopsDatabaseFactory::getDatabaseConnection() ;
 			$myts =& MyTextsanitizer::getInstance() ;
 
@@ -302,5 +302,5 @@
 			$d3f_prefix = $d3f_forum_dir;
 			$myts =& MyTextSanitizer::getInstance();
-			$xoopsDB =& Database::getInstance();
+			$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 
 			$wp_comments = $wp_full_prefix . 'comments';
@@ -444,5 +444,5 @@
 			$xp_prefix = preg_replace('/wordpress/','wp',$xp_prefix);
 			
-			$xoopsDB =& Database::getInstance();
+			$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 			$wp_d3forum_link = $xoopsDB->prefix($xp_prefix . '_d3forum_link');
 			
@@ -458,5 +458,5 @@
 		
 		function get_comment_blog_info($d3forum_forum_id){
-			$xoopsDB =& Database::getInstance();
+			$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 			$xp_prefix = $wpdirname = basename( dirname( dirname( __FILE__ ) ) ) ;
 			$xp_prefix = preg_replace('/wordpress/','wp',$xp_prefix);