Index: trunk/xpressme_integration_kit/include/general_functions.php
===================================================================
--- trunk/xpressme_integration_kit/include/general_functions.php	(revision 526)
+++ trunk/xpressme_integration_kit/include/general_functions.php	(revision 583)
@@ -13,10 +13,6 @@
 		if (empty($mydirname))
 			$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-
-		if ($mydirname == 'wordpress'){
-			$wp_prefix = 'wp';
-		} else {
-			$wp_prefix = $mydirname;
-		}
+		
+		$wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
 
 		if (empty($xoops_db)) { // not load XPressME
@@ -56,9 +52,5 @@
 			$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
 
-		if ($mydirname == 'wordpress'){
-			$wp_prefix = 'wp';
-		} else {
-			$wp_prefix = $mydirname;
-		}
+		$wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
 
 		if (empty($xoops_db)) { // not load XPressME