Index: trunk/xpressme_integration_kit/include/data.inc.php
===================================================================
--- trunk/xpressme_integration_kit/include/data.inc.php	(revision 426)
+++ trunk/xpressme_integration_kit/include/data.inc.php	(revision 583)
@@ -31,9 +31,5 @@
 	global $xoopsDB;
 
-	if ($mydirname == 'wordpress'){
-		$wp_prefix = 'wp';
-	} else {
-		$wp_prefix = $mydirname;
-	}
+	$wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
 	require_once (XOOPS_ROOT_PATH . '/modules/'.$mydirname . '/include/general_functions.php');
 	include(XOOPS_ROOT_PATH . '/modules/'.$mydirname . '/wp-includes/version.php');
@@ -163,10 +159,5 @@
 
 	global $xoopsDB;
-
-	if ($mydirname == 'wordpress'){
-		$wp_prefix = 'wp';
-	} else {
-		$wp_prefix = $mydirname;
-	}
+	$wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
 	require_once (XOOPS_ROOT_PATH . '/modules/'.$mydirname . '/include/general_functions.php');
 	$prefix = $xoopsDB->prefix($wp_prefix);
@@ -208,10 +199,5 @@
 
 	global $xoopsDB;
-
-	if ($mydirname == 'wordpress'){
-		$wp_prefix = 'wp';
-	} else {
-		$wp_prefix = $mydirname;
-	}
+	$wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
 	
 	require_once (XOOPS_ROOT_PATH . '/modules/'.$mydirname . '/include/general_functions.php');