Index: trunk/xpressme_integration_kit/admin/index.php
===================================================================
--- trunk/xpressme_integration_kit/admin/index.php	(revision 551)
+++ trunk/xpressme_integration_kit/admin/index.php	(revision 583)
@@ -36,6 +36,5 @@
 	$mydirname = basename(dirname(dirname(__FILE__)));
 	$my_dirpath = dirname(dirname(__FILE__));
-	$wp_prefix_only = $mydirname;
-	if ($wp_prefix_only == 'wordpress') $wp_prefix_only ='wp';
+	$wp_prefix_only = preg_replace('/wordpress/','wp',$mydirname);
 	$db_prefix = $xoopsDB->prefix($wp_prefix_only);
 
@@ -120,6 +119,5 @@
 	$mydirname = basename(dirname(dirname(__FILE__)));
 	$my_dirpath = dirname(dirname(__FILE__));
-	$prefix = $mydirname;
-	if ($prefix == 'wordpress') $prefix ='wp';
+	$prefix = preg_replace('/wordpress/','wp',$mydirname);
 	$wp_prefix = $xoopsDB->prefix($prefix);
 
@@ -540,7 +538,5 @@
 	
 	$xp_prefix = $GLOBALS['xoopsModule']->getInfo('dirname');
-	if ($xp_prefix == 'wordpress'){
-	 	$xp_prefix = 'wp';
-	}
+	$xp_prefix = preg_replace('/wordpress/','wp',$xp_prefix);
 
 	$prefix = $xoopsDB->prefix($xp_prefix . '_');
@@ -614,7 +610,5 @@
 	$xoopsDB =& Database::getInstance();
 	$xp_prefix = $GLOBALS['xoopsModule']->getInfo('dirname');
-	if ($xp_prefix == 'wordpress'){
-	 	$xp_prefix = 'wp';
-	}
+	$xp_prefix = preg_replace('/wordpress/','wp',$xp_prefix);
 	$prefix = $xoopsDB->prefix($xp_prefix . '_');
 	$group_role_tables = $prefix.'group_role';