Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php	(revision 562)
+++ trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php	(revision 563)
@@ -224,11 +224,10 @@
 		echo			'<table class="form-table">'."\n";
 		$upload_title = __('Media Upload Base Path','xpressme');
-		if(xpress_is_multiblog()) $upload_title = $upload_title . '(MultiBlog is not select)';
 		echo				$xpress_config->yes_no_radio_option('is_use_xoops_upload_path',
-												$upload_title,
-												__('Use XOOPS UPLOAD PATH','xpressme'),
-												__('USE WordPress BASE_PATH','xpressme'),
-												xpress_is_multiblog()
-												);
+											$upload_title,
+											__('Use XOOPS UPLOAD PATH','xpressme'),
+											__('USE WordPress BASE_PATH','xpressme'),
+											false
+											);
 //		$lock = ($xoops_config->module_url != get_bloginfo('url'));
 		$lock = false;
Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php	(revision 562)
+++ trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php	(revision 563)
@@ -306,5 +306,4 @@
 
 		global $xoops_config;
-		if(xpress_is_multiblog()) $this->is_use_xoops_upload_path = false;
 
 		$table = get_wp_prefix() . 'group_role';	
@@ -825,11 +824,16 @@
 	{
 		global $xoops_config;
+		global $blog_id,$blogname;
+		
 		if ($this->is_use_xoops_upload_path){
 			$wordpress_dir = ABSPATH ;
 			$xoops_dir = $xoops_config->xoops_upload_path . '/';
-			$wordpress_base_url = get_option( 'siteurl' );
+			if (xpress_is_multiblog() && $blog_id <> 1){
+				$wordpress_base_url = $xoops_config->module_url;
+			} else {
+				$wordpress_base_url = get_option( 'siteurl' );
+			}
 			$xoops_upload_url = $xoops_config->xoops_upload_url;
-			
-			@rmdir($uploads[path]);  //remove wordpress side uploads_dir 
+			// @rmdir($uploads[path]);  //remove wordpress side uploads_dir 
 			
 			$uploads[path] =  str_replace ($wordpress_dir, $xoops_dir, $uploads[path]);
@@ -837,4 +841,16 @@
 			$uploads[url] = str_replace ($wordpress_base_url, $xoops_upload_url, $uploads[url]);
 			$uploads[baseurl] = str_replace ($wordpress_base_url, $xoops_upload_url, $uploads[baseurl]);
+			
+			if (xpress_is_multiblog() && $blog_id <> 1){
+				$pat = str_replace ($xoops_dir, '', $uploads[path]);
+				$pat = preg_replace('/files.*/', '', $pat);
+				$pat = str_replace ('/', '\/', $pat);
+				$uploads[path] = preg_replace('/' . $pat . '/',  $blogname . '/',$uploads[path]);
+				
+				$pat = str_replace ($xoops_dir, '', $uploads[basedir]);
+				$pat = preg_replace('/files.*/', '', $pat);
+				$pat = str_replace ('/', '\/', $pat);
+				$uploads[basedir] = preg_replace('/' . $pat . '/',  $blogname . '/',$uploads[basedir]);
+			}
 			
 			// Make sure we have an uploads dir