Index: trunk/xpressme_integration_kit/blocks/block_common.php
===================================================================
--- trunk/xpressme_integration_kit/blocks/block_common.php	(revision 552)
+++ trunk/xpressme_integration_kit/blocks/block_common.php	(revision 583)
@@ -23,9 +23,5 @@
     $mydirpath = dirname(dirname(__FILE__));
 	$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-	if ($mydirname == 'wordpress'){
-		$wp_prefix = 'wp_';
-	} else {
-		$wp_prefix = $mydirname . '_';
-	}
+	$wp_prefix = preg_replace('/wordpress/','wp',$mydirname) . '_';
 	$xoopsDB =& Database::getInstance();
 	$myts =& MyTextSanitizer::getInstance();
Index: trunk/xpressme_integration_kit/blocks/widget_block.php
===================================================================
--- trunk/xpressme_integration_kit/blocks/widget_block.php	(revision 552)
+++ trunk/xpressme_integration_kit/blocks/widget_block.php	(revision 583)
@@ -23,10 +23,5 @@
 
 		$selected = explode(',' , $widget_select);
-
-		if ($mydirname == 'wordpress'){
-			$wp_prefix = 'wp_';
-		} else {
-			$wp_prefix = $mydirname . '_';
-		}
+		$wp_prefix = preg_replace('/wordpress/','wp',$mydirname) . '_';
 		$xoopsDB =& Database::getInstance();
 		$myts =& MyTextSanitizer::getInstance();