Index: branches/Ver3.0/xpressme_integration_kit/class/xpressD3commentContent.class.php
===================================================================
--- branches/Ver3.0/xpressme_integration_kit/class/xpressD3commentContent.class.php	(revision 732)
+++ branches/Ver3.0/xpressme_integration_kit/class/xpressD3commentContent.class.php	(revision 749)
@@ -10,6 +10,6 @@
 		//	include_once dirname(dirname(__FILE__)).'/include/common_functions.php' ;
 			global $forum_id;
-			
-			$db =& Database::getInstance() ;
+			global $xoopsDB;
+			
 			$myts =& MyTextsanitizer::getInstance() ;
 
@@ -26,5 +26,5 @@
 			$blog_info = $this->get_comment_blog_info($forum_id);
 			// query
-			$post_row = $db->fetchArray( $db->query( "SELECT * FROM ".$blog_info['mb_table_prefix']."posts WHERE ID=$post_id" ) ) ;
+			$post_row = $xoopsDB->fetchArray( $xoopsDB->query( "SELECT * FROM ".$blog_info['mb_table_prefix']."posts WHERE ID=$post_id" ) ) ;
 			if( empty( $post_row ) ) return '' ;
 
@@ -68,4 +68,5 @@
 		function canAddComment($external_link_id)
 		{
+			global $xoopsDB;
 			global $forum_id;
 			global $post;
@@ -80,5 +81,4 @@
 				}
 			}
-					$db =& Database::getInstance() ;
 					$myts =& MyTextsanitizer::getInstance() ;
 
@@ -97,5 +97,5 @@
 					// query
 					$sql = "SELECT * FROM ".$blog_info['mb_table_prefix']."posts WHERE ID=$post_id";
-					$post_row = $db->fetchArray( $db->query( $sql ) ) ;
+					$post_row = $xoopsDB->fetchArray( $xoopsDB->query( $sql ) ) ;
 					if( empty( $post_row ) ) return false ;
 					if ($post_row['comment_status'] == 'open')
@@ -176,4 +176,5 @@
 		function validate_id( $link_id )
 		{
+			global $xoopsDB;
 			global $forum_id;
 			$post_id = intval( $link_id ) ;
@@ -181,7 +182,6 @@
 			$xpress_prefix = preg_replace('/wordpress/','wp',$mydirname);
 			$blog_info = $this->get_comment_blog_info($forum_id);		
-			$db =& Database::getInstance() ;
-			
-			list( $count ) = $db->fetchRow( $db->query( "SELECT COUNT(*) FROM ".$blog_info['mb_table_prefix'] ."posts WHERE ID=$post_id AND comment_status ='open'" ) ) ;
+			
+			list( $count ) = $xoopsDB->fetchRow( $xoopsDB->query( "SELECT COUNT(*) FROM ".$blog_info['mb_table_prefix'] ."posts WHERE ID=$post_id AND comment_status ='open'" ) ) ;
 
 			if( $count <= 0 ) return false ;
@@ -206,8 +206,8 @@
 		function processCommentNotifications( $mode , $link_id , $forum_id , $topic_id , $post_id )
 		{
+			global $xoopsDB;
 			$blog_info = $this->get_comment_blog_info($forum_id);
 			$wp_full_prefix = $blog_info['mb_table_prefix'];
 
-			$db =& Database::getInstance() ;
 			$myts =& MyTextsanitizer::getInstance() ;
 
@@ -225,12 +225,12 @@
 			$table_term_taxonomy = $wp_full_prefix."term_taxonomy";
 			$table_terms = $wp_full_prefix."terms";
-			$table_categories = $db->prefix($xpress_prefix."_categories");
-			$table_post2cat = $db->prefix($xpress_prefix."_post2cat");
+			$table_categories = $xoopsDB->prefix($xpress_prefix."_categories");
+			$table_post2cat = $xoopsDB->prefix($xpress_prefix."_post2cat");
 			$wp_post = $wp_full_prefix."posts";
 			$wp_options = $wp_full_prefix."options";
-			$wp_users  = $db->prefix($xpress_prefix."_users");
+			$wp_users  = $xoopsDB->prefix($xpress_prefix."_users");
 						
 			$sql = "SELECT option_value  FROM $wp_options WHERE option_name ='blogname'";
-			$blog_row = $db->fetchArray( $db->query( $sql ) ) ;
+			$blog_row = $xoopsDB->fetchArray( $xoopsDB->query( $sql ) ) ;
 			if( empty( $blog_row ) ) return false;
 			$blog_name = $blog_row['option_value'];
@@ -239,5 +239,5 @@
 			// query
 			$sql = "SELECT * FROM ".$wp_post." WHERE ID=$link_id ";
-			$post_row = $db->fetchArray( $db->query( $sql ) ) ;
+			$post_row = $xoopsDB->fetchArray( $xoopsDB->query( $sql ) ) ;
 			if( empty( $post_row ) ) return false;
 			$post_title = $post_row['post_title'];
@@ -245,5 +245,5 @@
 			
 			$sql = "SELECT display_name  FROM $wp_users WHERE ID ='$post_author'";
-			$blog_row = $db->fetchArray( $db->query( $sql ) ) ;
+			$blog_row = $xoopsDB->fetchArray( $xoopsDB->query( $sql ) ) ;
 			if( empty( $blog_row ) ) return false;
 			$user_name = $blog_row['display_name'];
@@ -263,5 +263,5 @@
 			$notification_handler->triggerEvent( 'post' , $link_id , 'comment' , $comment_tags , false , $not_modid ) ;
 			
-			$post_row = $db->fetchArray( $db->query( "SELECT * FROM ".$db->prefix($this->d3forum_dirname."_posts")." WHERE post_id=$post_id" ) ) ;
+			$post_row = $xoopsDB->fetchArray( $xoopsDB->query( "SELECT * FROM ".$xoopsDB->prefix($this->d3forum_dirname."_posts")." WHERE post_id=$post_id" ) ) ;
 			if( !empty( $post_row ) ){
 				if ( $post_row['approval'] ==0 ){
@@ -279,6 +279,6 @@
 					$sql2 .= "WHERE ($table_term_relationships.object_id =" . $link_id.") AND ($table_term_taxonomy.taxonomy='category')";		
 			}
-			$res2 = $db->query($sql2);
-			while($row2 = $db->fetchArray($res2)){
+			$res2 = $xoopsDB->query($sql2);
+			while($row2 = $xoopsDB->fetchArray($res2)){
 				$cat_id = $row2['cat_ID'];
 				$cat_name = $row2['cat_name'];
@@ -291,4 +291,6 @@
 
 		function sync_to_wp_comment( $mode , $link_id , $forum_id , $topic_id , $post_id = 0 ){
+
+			global $xoopsDB;
 
 			$blog_info = $this->get_comment_blog_info($forum_id);
@@ -302,5 +304,4 @@
 			$d3f_prefix = $d3f_forum_dir;
 			$myts =& MyTextSanitizer::getInstance();
-			$xoopsDB =& Database::getInstance();
 
 			$wp_comments = $wp_full_prefix . 'comments';
@@ -441,8 +442,9 @@
 		}
 		function get_wp_comment_ID($d3forum_post_ID){
+			global $xoopsDB;
+
 			$xp_prefix = $wpdirname = basename( dirname( dirname( __FILE__ ) ) ) ;
 			$xp_prefix = preg_replace('/wordpress/','wp',$xp_prefix);
 			
-			$xoopsDB =& Database::getInstance();
 			$wp_d3forum_link = $xoopsDB->prefix($xp_prefix . '_d3forum_link');
 			
@@ -458,5 +460,5 @@
 		
 		function get_comment_blog_info($d3forum_forum_id){
-			$xoopsDB =& Database::getInstance();
+			global $xoopsDB;
 			$xp_prefix = $wpdirname = basename( dirname( dirname( __FILE__ ) ) ) ;
 			$xp_prefix = preg_replace('/wordpress/','wp',$xp_prefix);