Index: branches/Ver2.0/xpressme_integration_kit/blocks/widget_block.php
===================================================================
--- branches/Ver2.0/xpressme_integration_kit/blocks/widget_block.php	(revision 301)
+++ branches/Ver2.0/xpressme_integration_kit/blocks/widget_block.php	(revision 303)
@@ -20,7 +20,23 @@
 		$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_widget_block.html' : trim( $options[1] );
     	$selected = array_slice($options,2); // get allowed cats
+
+		if ($mydirname == 'wordpress'){
+			$wp_prefix = 'wp_';
+		} else {
+			$wp_prefix = $mydirname . '_';
+		}
+		$xoopsDB =& Database::getInstance();
+		$myts =& MyTextSanitizer::getInstance();
+
+		$db_xpress_options = $xoopsDB->prefix($wp_prefix . 'options');
+		$query = "SELECT option_value FROM $db_xpress_options WHERE option_name = 'sidebars_widgets' LIMIT 1";
+		$res =  $xoopsDB->query($query, 0, 0);
+	    if ($res !== false){
+	 		$row = $xoopsDB->fetchArray($res);
+	 		$sidebars_widgets = @unserialize( $row['option_value'] );
+	 	}
+	 	if ( !isset($sidebars_widgets['array_version']) )
+			$sidebars_widgets['array_version'] = 1;
 		
-		global $table_prefix,$wpdb,$xoops_db;
-		global $wp_registered_sidebars, $wp_registered_widgets;
 		
 		require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php');
@@ -31,17 +47,19 @@
 		$form .= _MB_XP2_SELECT_WIDGET .":<br />\n";
 		$form .= "&nbsp;&nbsp;&nbsp;<select name='options[]' multiple=\"multiple\">\n";
-		$sidebars_widgets = wp_get_sidebars_widgets();
-		foreach($wp_registered_sidebars as $sidebar){
-			$sidebar_id = $sidebar['id'];
-			$widgets = $sidebars_widgets[$sidebar_id];
-			foreach($widgets as $widget){
-				if (empty($wp_registered_widgets[$widget])) continue;
-				$widget_str = $sidebar_id . '::' . $widget;
-				if (in_array($widget_str, $selected))
-					$form .=  "<option value='" .  $widget_str . "' selected='selected'>" . $widget_str;
-				else
-					$form .=  "<option value='" . $widget_str . "'>" . $widget_str;
+		foreach ( (array) $sidebars_widgets as $index => $sidebar ){
+			if ( is_array($sidebar) ){
+				$sidebar_id = $index;
+				foreach ( (array) $sidebar as $i => $name ) {
+					$widget = strtolower($name);
+					$widget_str = $sidebar_id . '::' . $widget;
+					if (in_array($widget_str, $selected))
+						$form .=  "<option value='" .  $widget_str . "' selected='selected'>" . $widget_str;
+					else
+						$form .=  "<option value='" . $widget_str . "'>" . $widget_str;
+					
+				}
 			}
 		}
+
 		$form .=  "</select><br/>\n";
 		return $form;
@@ -57,11 +75,4 @@
 		return xpress_block_render($mydirname,$block_function_name,$options);
 	}
-	
-	function sidebar_select($wp_registered_sidebars,$option_name,$option_value)
-	{
-		
-	}
-	
 }
-
 ?>