Index: /branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/include/notify_functions.php
===================================================================
--- /branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/include/notify_functions.php	(revision 418)
+++ /branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/include/notify_functions.php	(revision 419)
@@ -78,16 +78,15 @@
 function do_CommentNotifications($commentID, $comment_post_ID)
 {
-	global $xoops_config , $xoops_db;
-
-	$xpress_prefix = get_wp_prefix() ;
-
-	$table_term_relationships = $xpress_prefix .'term_relationships';
-	$table_term_taxonomy = $xpress_prefix .'term_taxonomy';
-	$table_terms = $xpress_prefix .'terms';
-	$table_categories = $xpress_prefix .'categories';
-	$wp_post = $xpress_prefix .'posts';
-	$wp_options = $xpress_prefix .'options';
-	$wp_users  = $xpress_prefix .'users';
-	$wp_comments  = $xpress_prefix .'comments';
+	global $wpdb, $xoops_config , $xoops_db;
+
+	$table_term_relationships = $wpdb->term_relationships;
+	$table_term_taxonomy = $wpdb->term_taxonomy;
+	$table_terms = $wpdb->terms;
+	$table_categories = $wpdb->categories;
+	$wp_post = $wpdb->posts;
+	$wp_options = $wpdb->options;
+	$wp_users  = $wpdb->users;
+	$wp_comments  = $wpdb->comments;
+	
 	$post_id = $comment_post_ID;
 
@@ -128,20 +127,16 @@
 function do_PostNotifications($post_id,$not_event)
 {
-	global $xoops_config, $xoops_db;
-	
-
+	global $wpdb, $xoops_config, $xoops_db;
 
 	 // $not_event:		newpost,editpost ; $commentID, $comment_post_ID)
-	 
-	$xpress_prefix = get_wp_prefix() ;
-
-	$table_term_relationships = $xpress_prefix .'term_relationships';
-	$table_term_taxonomy = $xpress_prefix .'term_taxonomy';
-	$table_terms = $xpress_prefix .'terms';
-	$table_categories = $xpress_prefix .'categories';
-	$wp_post = $xpress_prefix .'posts';
-	$wp_options = $xpress_prefix .'options';
-	$wp_users  = $xpress_prefix .'users';
-	$wp_comments  = $xpress_prefix .'comments';
+	
+	$table_term_relationships = $wpdb->term_relationships;
+	$table_term_taxonomy = $wpdb->term_taxonomy;
+	$table_terms = $wpdb->terms;
+	$table_categories = $wpdb->categories;
+	$wp_post = $wpdb->posts;
+	$wp_options = $wpdb->options;
+	$wp_users  = $wpdb->users;
+	$wp_comments  = $wpdb->comments;
 
 	$post_title = get_the_title($post_id);
Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/notify_functions.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/notify_functions.php	(revision 418)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/notify_functions.php	(revision 419)
@@ -78,16 +78,15 @@
 function do_CommentNotifications($commentID, $comment_post_ID)
 {
-	global $xoops_config , $xoops_db;
-
-	$xpress_prefix = get_wp_prefix() ;
-
-	$table_term_relationships = $xpress_prefix .'term_relationships';
-	$table_term_taxonomy = $xpress_prefix .'term_taxonomy';
-	$table_terms = $xpress_prefix .'terms';
-	$table_categories = $xpress_prefix .'categories';
-	$wp_post = $xpress_prefix .'posts';
-	$wp_options = $xpress_prefix .'options';
-	$wp_users  = $xpress_prefix .'users';
-	$wp_comments  = $xpress_prefix .'comments';
+	global $wpdb, $xoops_config , $xoops_db;
+
+	$table_term_relationships = $wpdb->term_relationships;
+	$table_term_taxonomy = $wpdb->term_taxonomy;
+	$table_terms = $wpdb->terms;
+	$table_categories = $wpdb->categories;
+	$wp_post = $wpdb->posts;
+	$wp_options = $wpdb->options;
+	$wp_users  = $wpdb->users;
+	$wp_comments  = $wpdb->comments;
+	
 	$post_id = $comment_post_ID;
 
@@ -128,20 +127,16 @@
 function do_PostNotifications($post_id,$not_event)
 {
-	global $xoops_config, $xoops_db;
-	
-
+	global $wpdb, $xoops_config, $xoops_db;
 
 	 // $not_event:		newpost,editpost ; $commentID, $comment_post_ID)
-	 
-	$xpress_prefix = get_wp_prefix() ;
-
-	$table_term_relationships = $xpress_prefix .'term_relationships';
-	$table_term_taxonomy = $xpress_prefix .'term_taxonomy';
-	$table_terms = $xpress_prefix .'terms';
-	$table_categories = $xpress_prefix .'categories';
-	$wp_post = $xpress_prefix .'posts';
-	$wp_options = $xpress_prefix .'options';
-	$wp_users  = $xpress_prefix .'users';
-	$wp_comments  = $xpress_prefix .'comments';
+	
+	$table_term_relationships = $wpdb->term_relationships;
+	$table_term_taxonomy = $wpdb->term_taxonomy;
+	$table_terms = $wpdb->terms;
+	$table_categories = $wpdb->categories;
+	$wp_post = $wpdb->posts;
+	$wp_options = $wpdb->options;
+	$wp_users  = $wpdb->users;
+	$wp_comments  = $wpdb->comments;
 
 	$post_title = get_the_title($post_id);