Index: /trunk/xpressme_integration_kit/include/add_xpress_process.php
===================================================================
--- /trunk/xpressme_integration_kit/include/add_xpress_process.php	(revision 566)
+++ /trunk/xpressme_integration_kit/include/add_xpress_process.php	(revision 567)
@@ -35,5 +35,5 @@
 		$blog_sub_path = '';
 		if(function_exists('is_multisite') && is_multisite()){
-			if ($blog_id > 1){
+			if ($blog_id > 0 && $blog_id != BLOG_ID_CURRENT_SITE){
 				$blog_sub_path = '/' .$blogname;
 			}
Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php	(revision 566)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php	(revision 567)
@@ -48,5 +48,5 @@
 function xpress_is_multiblog_root() {
 	global $blog_id;
-	if ( xpress_is_multiblog() && $blog_id == 1){
+	if ( xpress_is_multiblog() && $blog_id == BLOG_ID_CURRENT_SITE){
 		return true;
 	} else {
Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php	(revision 566)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php	(revision 567)
@@ -158,5 +158,11 @@
  		global $xoops_db, $blog_id;
 		
-		if (empty($blog_id)) $blog_id = 1;
+		if (empty($blog_id)) {
+			if (defined(BLOG_ID_CURRENT_SITE)){
+				$blog_id = BLOG_ID_CURRENT_SITE;
+			} else {
+				$blog_id = 1;
+			}
+		}
 		$table = get_wp_prefix() . 'group_role';
 		
@@ -165,8 +171,14 @@
 	}
 
-	function GroupeRoleCheck($blog_id = 1) {
+	function GroupeRoleCheck($blog_id = 0) {
  		global $xoops_db;
 		
-		if (empty($blog_id)) $blog_id = 1;
+		if (empty($blog_id)) {
+			if (defined(BLOG_ID_CURRENT_SITE)){
+				$blog_id = BLOG_ID_CURRENT_SITE;
+			} else {
+				$blog_id = 1;
+			}
+		}
 		
 		$module_id = get_xpress_modid();
@@ -256,5 +268,11 @@
 		global $xoops_db, $blog_id;
 		
-		if (empty($blog_id)) $blog_id = 1;
+		if (empty($blog_id)) {
+			if (defined(BLOG_ID_CURRENT_SITE)){
+				$blog_id = BLOG_ID_CURRENT_SITE;
+			} else {
+				$blog_id = 1;
+			}
+		}
 		foreach ( (array) $post_data as $index_key => $value ){
 			if (preg_match('/^ch_/',$index_key)){  // case ch_
@@ -829,5 +847,5 @@
 			$wordpress_dir = ABSPATH ;
 			$xoops_dir = $xoops_config->xoops_upload_path . '/';
-			if (xpress_is_multiblog() && $blog_id <> 1){
+			if (xpress_is_multiblog() && $blog_id <> BLOG_ID_CURRENT_SITE){
 				$wordpress_base_url = $xoops_config->module_url;
 			} else {
@@ -842,5 +860,5 @@
 			$uploads[baseurl] = str_replace ($wordpress_base_url, $xoops_upload_url, $uploads[baseurl]);
 			
-			if (xpress_is_multiblog() && $blog_id <> 1){
+			if (xpress_is_multiblog() && $blog_id <> BLOG_ID_CURRENT_SITE){
 				$pat = str_replace ($xoops_dir, '', $uploads[path]);
 				$pat = preg_replace('/files.*/', '', $pat);