Index: /branches/XPressMU/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/popular_posts_block_theme.php
===================================================================
--- /branches/XPressMU/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/popular_posts_block_theme.php	(revision 417)
+++ /branches/XPressMU/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/popular_posts_block_theme.php	(revision 418)
@@ -30,14 +30,14 @@
 	$db_prefix = get_wp_prefix();
 	
-	$post_tb = $db_prefix . 'posts';
+	$post_tb = $wpdb->posts;
 	$view_tb = $db_prefix . 'views';
 	$user_tb = $db_prefix . 'users';
 	
-	$term_relationships_tb = $db_prefix . 'term_relationships';	// upper 2.3
-	$term_taxonomy = $db_prefix . 'term_taxonomy';				// upper 2.3
-	$terms_tb = $db_prefix . 'terms';							// upper 2.3
-	
-	$post2cat_tb = $db_prefix . 'post2cat'; 					//under 2.3
-	$categories_tb = $db_prefix . 'categories'; 				//under 2.3
+	$term_relationships_tb = $wpdb->term_relationships;	// upper 2.3
+	$term_taxonomy = $wpdb->term_taxonomy;				// upper 2.3
+	$terms_tb = $wpdb->terms;							// upper 2.3
+
+	$post2cat_tb = $wpdb->post2cat; 					//under 2.3
+	$categories_tb = $wpdb->categories; 				//under 2.3
 	
 	include ($mydirpath . '/wp-includes/version.php');
@@ -198,9 +198,7 @@
 	}
 	
-	
-	
-	$db_prefix = get_wp_prefix();
-	$db_xpress_terms = $db_prefix . 'terms';					// upper 2.3
-	$db_xpress_term_taxonomy = $db_prefix . 'term_taxonomy';				// upper 2.3
+	$db_xpress_terms = $wpdb->terms;					// upper 2.3
+	$db_xpress_term_taxonomy = $wpdb->term_taxonomy;				// upper 2.3
+
 	$query = "
 		SELECT $db_xpress_terms.term_id as tag_ID  
Index: /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/popular_posts_block_theme.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/popular_posts_block_theme.php	(revision 417)
+++ /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/popular_posts_block_theme.php	(revision 418)
@@ -30,14 +30,14 @@
 	$db_prefix = get_wp_prefix();
 	
-	$post_tb = $db_prefix . 'posts';
+	$post_tb = $wpdb->posts;
 	$view_tb = $db_prefix . 'views';
 	$user_tb = $db_prefix . 'users';
 	
-	$term_relationships_tb = $db_prefix . 'term_relationships';	// upper 2.3
-	$term_taxonomy = $db_prefix . 'term_taxonomy';				// upper 2.3
-	$terms_tb = $db_prefix . 'terms';							// upper 2.3
-	
-	$post2cat_tb = $db_prefix . 'post2cat'; 					//under 2.3
-	$categories_tb = $db_prefix . 'categories'; 				//under 2.3
+	$term_relationships_tb = $wpdb->term_relationships;	// upper 2.3
+	$term_taxonomy = $wpdb->term_taxonomy;				// upper 2.3
+	$terms_tb = $wpdb->terms;							// upper 2.3
+
+	$post2cat_tb = $wpdb->post2cat; 					//under 2.3
+	$categories_tb = $wpdb->categories; 				//under 2.3
 	
 	include ($mydirpath . '/wp-includes/version.php');
@@ -198,9 +198,7 @@
 	}
 	
-	
-	
-	$db_prefix = get_wp_prefix();
-	$db_xpress_terms = $db_prefix . 'terms';					// upper 2.3
-	$db_xpress_term_taxonomy = $db_prefix . 'term_taxonomy';				// upper 2.3
+	$db_xpress_terms = $wpdb->terms;					// upper 2.3
+	$db_xpress_term_taxonomy = $wpdb->term_taxonomy;				// upper 2.3
+
 	$query = "
 		SELECT $db_xpress_terms.term_id as tag_ID  
