Index: trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/blog_list_block_theme.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/blog_list_block_theme.php	(revision 533)
+++ trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/blog_list_block_theme.php	(revision 536)
@@ -3,4 +3,5 @@
 function blog_list_block($options)
 {
+	if(is_admin()) return; // wp-admin page is not exists
 	$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
 	$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_category.html' : trim( $options[1] );
@@ -8,58 +9,62 @@
 	$order = empty( $options[3] ) ? 'ASC' : $options[3] ;
 
-	$blogs = get_blog_list(0,'all');
-	$data = array();
-	foreach ($blogs AS $blog) {
-		$url =  get_blog_option($blog['blog_id'],'siteurl');
-		$blog_name = get_blog_option( $blog['blog_id'], 'blogname' );
-		$blog_link = "<a href=\" $url \"> $blog_name </a>";
-		$blog_id = $blog['blog_id'];
-		$post_count = $blog['postcount'];
-		$last_post_date = '';
-		$last_post_time = '';
-		$last_post_date_time = '';
-			
-		$row_data = array(
-			'blog_id'		=> $blog_id ,
-			'blog_name'	=> $blog_link ,
-			'last_post_date' => $last_post_date ,
-			'last_post_time' => $last_post_time ,
-			'post_date_time' => $last_post_date_time ,
-			'last_post_date_time' => $post_modified_date ,
-			'post_count' => $post_count
-		);
-		$data[] = $row_data;
+	if (xpress_is_multiblog() && function_exists('get_blog_list')){
+		$blogs = get_blog_list(0,'all');
+		$data = array();
+		foreach ($blogs AS $blog) {
+			$url =  get_blog_option($blog['blog_id'],'siteurl');
+			$blog_name = get_blog_option( $blog['blog_id'], 'blogname' );
+			$blog_link = "<a href=\" $url \"> $blog_name </a>";
+			$blog_id = $blog['blog_id'];
+			$post_count = $blog['postcount'];
+			$last_post_date = '';
+			$last_post_time = '';
+			$last_post_date_time = '';
+				
+			$row_data = array(
+				'blog_id'		=> $blog_id ,
+				'blog_name'	=> $blog_link ,
+				'last_post_date' => $last_post_date ,
+				'last_post_time' => $last_post_time ,
+				'post_date_time' => $last_post_date_time ,
+				'last_post_date_time' => $post_modified_date ,
+				'post_count' => $post_count
+			);
+			$data[] = $row_data;
+		}
+		if (strcmp($order,'ASC') == 0){
+			switch($orderby){
+				case 'count':
+					usort($data, "r_post_count_cmp");
+					break;
+				case 'ID' :
+					usort($data, "r_blog_id_cmp");
+					break;
+				default :
+					usort($data, "r_blog_name_cmp");
+			}
+		} else {
+			switch($orderby){
+				case 'count':
+					usort($data, "post_count_cmp");
+					break;
+				case 'ID' :
+					usort($data, "blog_id_cmp");
+					break;
+				default :
+					usort($data, "blog_name_cmp");
+			}
+		}
+		
+		$block = array();
+		$item_no = 0;	
+		foreach ($data AS $row) {
+			$block['contents']['item'.$item_no] = $row;
+			$item_no++;
+		}// end of foreach
+		$block['data_count'] = $item_no;  //xml unserialise error
+	} else {
+		$block['err_message'] = __('This blog is not set to the multi blog.', 'xpress');
 	}
-	if (strcmp($order,'ASC') == 0){
-		switch($orderby){
-			case 'count':
-				usort($data, "r_post_count_cmp");
-				break;
-			case 'ID' :
-				usort($data, "r_blog_id_cmp");
-				break;
-			default :
-				usort($data, "r_blog_name_cmp");
-		}
-	} else {
-		switch($orderby){
-			case 'count':
-				usort($data, "post_count_cmp");
-				break;
-			case 'ID' :
-				usort($data, "blog_id_cmp");
-				break;
-			default :
-				usort($data, "blog_name_cmp");
-		}
-	}
-	
-	$block = array();
-	$item_no = 0;	
-	foreach ($data AS $row) {
-		$block['contents']['item'.$item_no] = $row;
-		$item_no++;
-	}// end of foreach
-	$block['data_count'] = $item_no;  //xml unserialise error
 	return $block ;
 }
Index: trunk/xpressme_integration_kit/wp-content/themes/xpress_default/ja.po
===================================================================
--- trunk/xpressme_integration_kit/wp-content/themes/xpress_default/ja.po	(revision 533)
+++ trunk/xpressme_integration_kit/wp-content/themes/xpress_default/ja.po	(revision 536)
@@ -4,11 +4,10 @@
 # toemon <info@toemon.com>
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: XPress_Default_themes\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-03 01:27+0900\n"
-"PO-Revision-Date: 2009-07-03 01:27+0900\n"
+"POT-Creation-Date: 2010-03-11 10:02+0900\n"
+"PO-Revision-Date: 2010-03-11 10:05+0900\n"
 "Last-Translator: toemon <info@toemon.com>\n"
 "Language-Team: toemon <info@toemon.com>\n"
@@ -20,5 +19,5 @@
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-KeywordsList: __;_e;_c\n"
-"X-Poedit-Basepath: C:\\XPressME_Project\\SVN\\trunk\\xpressme_integration_kit\\wp-content\\themes\\xpress_default\n"
+"X-Poedit-Basepath: C:\\XPressME_Project\\XPressME_SVN_Trunk\\xpressme_integration_kit\\wp-content\\themes\\xpress_default\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SearchPath-0: .\n"
@@ -370,5 +369,4 @@
 
 #: image.php:13
-#: index.php:36
 #: single.php:32
 msgid "Read the rest of this entry &raquo;"
@@ -480,4 +478,37 @@
 msgstr "リンク:"
 
+#: multi_blog.php:4
+msgid "Site News"
+msgstr "サイトニュース"
+
+#: multi_blog.php:13
+msgid "Blogs List"
+msgstr "ブログリスト"
+
+#: multi_blog.php:22
+msgid "post count"
+msgstr "投稿数"
+
+#: multi_blog.php:32
+msgid "New Entries"
+msgstr "最近の投稿"
+
+#: multi_blog.php:65
+msgid "Updated Blogs"
+msgstr "最近更新されたブログ"
+
+#: multi_blog.php:86
+#, php-format
+msgid "Howdy %s"
+msgstr "ようこそ %s さん"
+
+#: multi_blog.php:92
+msgid "Your Blogs list"
+msgstr "あなたのブログリスト"
+
+#: multi_blog.php:103
+msgid "Create a new blog"
+msgstr "新しいブログの作成"
+
 #: page.php:27
 msgid "Read the rest of this page &raquo;"
@@ -588,101 +619,105 @@
 msgstr "トラックバック / ピンバックは現在受け付けていません。"
 
-#: blocks/archives_block_theme.php:13
+#: blocks/archives_block_theme.php:14
 msgid "Select Yearly"
 msgstr "年を選択"
 
-#: blocks/archives_block_theme.php:16
-#: blocks/archives_block_theme.php:28
+#: blocks/archives_block_theme.php:17
+#: blocks/archives_block_theme.php:29
 msgid "Select Monthly"
 msgstr "月を選択"
 
-#: blocks/archives_block_theme.php:19
+#: blocks/archives_block_theme.php:20
 msgid "Select Weekly"
 msgstr "週を選択"
 
-#: blocks/archives_block_theme.php:22
+#: blocks/archives_block_theme.php:23
 msgid "Select Daily"
 msgstr "日を選択"
 
-#: blocks/archives_block_theme.php:25
+#: blocks/archives_block_theme.php:26
 msgid "Select Post"
 msgstr "記事を選択"
 
-#: blocks/authors_block_theme.php:31
+#: blocks/authors_block_theme.php:32
 msgid "All Authors"
 msgstr "全ての投稿者"
 
-#: blocks/enhanced_block_theme.php:11
+#: blocks/blog_list_block_theme.php:66
+msgid "This blog is not set to the multi blog."
+msgstr "このブログはマルチブログに設定されていません。"
+
+#: blocks/enhanced_block_theme.php:12
 msgid "The include file name to display it is not set."
 msgstr "表示を行うためのインクルードファイル名が設定されていません。"
 
-#: blocks/enhanced_block_theme.php:13
+#: blocks/enhanced_block_theme.php:14
 #, php-format
 msgid "File %s not exist."
 msgstr "ファイル %s が見つかりません。"
 
-#: blocks/enhanced_block_theme.php:19
+#: blocks/enhanced_block_theme.php:20
 msgid "PHP code error"
 msgstr "PHPコードにエラーがあります。"
 
-#: blocks/meta_block_theme.php:24
+#: blocks/meta_block_theme.php:25
 msgid "Posts RSS"
 msgstr "投稿の RSS"
 
-#: blocks/meta_block_theme.php:27
+#: blocks/meta_block_theme.php:28
 msgid "Comments RSS"
 msgstr "コメント のRSS"
 
-#: blocks/meta_block_theme.php:40
-#: blocks/meta_block_theme.php:45
+#: blocks/meta_block_theme.php:41
+#: blocks/meta_block_theme.php:46
 msgid "Add New"
 msgstr "新規投稿"
 
-#: blocks/meta_block_theme.php:54
+#: blocks/meta_block_theme.php:55
 msgid "Site Admin"
 msgstr "WordPress管理"
 
-#: blocks/meta_block_theme.php:60
+#: blocks/meta_block_theme.php:61
 msgid "User Profile"
 msgstr "ユーザープロファイル"
 
-#: blocks/meta_block_theme.php:68
-#: blocks/meta_block_theme.php:73
+#: blocks/meta_block_theme.php:69
+#: blocks/meta_block_theme.php:74
 msgid "Subscription management"
 msgstr "メール購読の設定"
 
-#: blocks/meta_block_theme.php:81
+#: blocks/meta_block_theme.php:82
 msgid "ReadMe"
 msgstr "ReadMe表示"
 
-#: blocks/meta_block_theme.php:86
+#: blocks/meta_block_theme.php:87
 msgid "Themes"
 msgstr "テーマ選択"
 
 #: blocks/popular_posts_block_theme.php:122
-#: blocks/recent_posts_content_block_theme.php:66
-#: blocks/recent_posts_list_block_theme.php:68
+#: blocks/recent_posts_content_block_theme.php:84
+#: blocks/recent_posts_list_block_theme.php:70
 msgid "Tags:"
 msgstr "タグ:"
 
 #: blocks/popular_posts_block_theme.php:151
-#: blocks/recent_posts_content_block_theme.php:105
-#: blocks/recent_posts_list_block_theme.php:97
+#: blocks/recent_posts_content_block_theme.php:123
+#: blocks/recent_posts_list_block_theme.php:99
 msgid "Comments (0)"
 msgstr "コメントはありません"
 
 #: blocks/popular_posts_block_theme.php:151
-#: blocks/recent_posts_content_block_theme.php:105
-#: blocks/recent_posts_list_block_theme.php:97
+#: blocks/recent_posts_content_block_theme.php:123
+#: blocks/recent_posts_list_block_theme.php:99
 msgid "Comments (1)"
 msgstr "1件のコメント"
 
 #: blocks/popular_posts_block_theme.php:151
-#: blocks/recent_posts_content_block_theme.php:105
-#: blocks/recent_posts_list_block_theme.php:97
+#: blocks/recent_posts_content_block_theme.php:123
+#: blocks/recent_posts_list_block_theme.php:99
 msgid "Comments (%)"
 msgstr "Comments (%)"
 
-#: blocks/recent_comments_block_theme.php:81
+#: blocks/recent_comments_block_theme.php:78
 #, php-format
 msgid "%1$s on %2$s"
Index: trunk/xpressme_integration_kit/wp-content/themes/xpress_default/multi_blog.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/themes/xpress_default/multi_blog.php	(revision 533)
+++ trunk/xpressme_integration_kit/wp-content/themes/xpress_default/multi_blog.php	(revision 536)
@@ -27,38 +27,13 @@
 		
 <?php
-	$date_format = get_settings('date_format');
-	$blog_count = get_blog_count();
-	if ($blog_count > 1){
-		echo '<h3>' . __('New Entries', 'xpress') . "</h3>\n";
-
-		$blog_list = get_blog_list();
-		echo "<ul>\n";
-		for ($i = 0; $i < $blog_count; $i++){
-    		$blog_id = $blog_list[$i]['blog_id'];
-			if ($blog_id == 1) continue;
-        	$output_blogs = '<li><a href="' .
-            get_blog_option($blog_id,'siteurl') . '">' .
-            get_blog_option($blog_id,'blogname') .
-            '</a></li>';
-        	echo $output_blogs;
-
-			$wpdb->set_blog_id($blog_id);
-			query_posts("showposts=3&post_status=publish");
-			if (have_posts()){
-				echo "<ul>\n";
-				while(have_posts()){
-					the_post();
-        			echo '<li>';
-        			echo '<a href="' . $post->guid . '">' . $post->post_title . "</a>\n(";
-        			the_time($date_format);
-        			echo ")</li>\n";
-        		}
-				echo "</ul>\n";
-			}
-		}
-		$wpdb->set_blog_id(1);
-
-		echo "</ul>\n";
+	echo '<h3>' . __('New Entries', 'xpress') . "</h3>\n";
+	$data_array = xpress_grobal_recent_posts();
+	echo "<ul>\n";
+	foreach($data_array as $data){
+		echo '<li>';
+		printf(__('%1$s wrote %2$s in %3$s.','xpress'), $data->post_author,$data->title_link,$data->blog_link);
+		echo "</li>\n";
 	}
+	echo "</ul>\n";
 ?>
 
@@ -104,5 +79,4 @@
 			echo "</ul>\n";			
 		}
-
 	?>