Index: tags/Ver2.2.2/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php	(revision 454)
+++ tags/Ver2.2.2/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php	(revision 504)
@@ -95,5 +95,5 @@
 
 	$output = '';
-  	$author_cookie = get_xpress_dir_name() . "_select_author" ;
+  	$author_cookie = 'select_' . get_xpress_dir_name() . "_author" ;
   	if (!empty($_COOKIE[$author_cookie])){
   		$uid = intval($_COOKIE[$author_cookie]);
@@ -115,5 +115,5 @@
 	extract( $r );
 	$output = '';
-  	$author_cookie = get_xpress_dir_name() . "_select_author" ;
+  	$author_cookie = 'select_' . get_xpress_dir_name() . "_author" ;
   	if (!empty($_COOKIE[$author_cookie])){
   		$output = intval($_COOKIE[$author_cookie]);
@@ -161,8 +161,9 @@
 	$xpress_codename = $xoops_config->module_codename;
 	if ($no_link){
-		$output = 'XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename);
 		if ($xoops_config->is_wpmu) {
+			$output = 'XPressMU Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename);
 			$output .= '(included WordPress MU ' . $wpmu_version. ')';
 		} else {
+			$output = 'XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename);
 			if (strstr($wp_version,'ME')){
 				$output .= '(included WordPress ' . $wp_version . ')';
@@ -172,8 +173,9 @@
 		}
 	} else {
-		$output = '<a href="http://ja.xpressme.info"'. " target='_blank'" . '>XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename) .'</a>';
 		if ($xoops_config->is_wpmu) {
+			$output = '<a href="http://ja.xpressme.info"'. " target='_blank'" . '>XPressMU Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename) .'</a>';
 			$output .= '(included <a href="http://mu.wordpress.org/" title="Powered by WordPress"'." target='_blank'". '>WordPress MU ' . $wpmu_version . '</a>)';
 		} else {
+			$output = '<a href="http://ja.xpressme.info"'. " target='_blank'" . '>XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename) .'</a>';
 			if (strstr($wp_version,'ME')){
 				$output .= '(included <a href="http://wpme.sourceforge.jp/" title="Powered by WordPress"'." target='_blank'". '>WordPress ' . $wp_version . '</a>)';
@@ -467,5 +469,5 @@
 }
 
-function set_post_views_count(&$content) {
+function set_post_views_count($content) {
 	if ( empty($_GET["feed"]) &&  empty($GLOBALS["feed"]) && empty($GLOBALS["doing_trackback"]) && empty($GLOBALS["doing_rss"]) && empty($_POST) && is_single() ){
 		post_views_counting();
Index: tags/Ver2.2.2/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.php	(revision 454)
+++ tags/Ver2.2.2/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.php	(revision 504)
@@ -242,5 +242,5 @@
 	if (is_admin()) return $query_vars;
 	
-	$author_cookie = get_xpress_dir_name() . "_select_author" ;
+	$author_cookie = 'select_' . get_xpress_dir_name() . "_author" ;
 	if(xpress_is_multi_user()){
 		if (!empty($_GET)){
@@ -290,9 +290,9 @@
 }
 
-function xpress_query_filter(&$query)
+function xpress_query_filter($query)
 {
 	if (is_admin()) return $query;
 
-	$author_cookie = get_xpress_dir_name() . "_select_author" ;
+	$author_cookie = 'select_' . get_xpress_dir_name() . "_author" ;
 	
 	if (strpos($query,'SELECT') === false)  return $query;
Index: tags/Ver2.2.2/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_upgrade.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_upgrade.php	(revision 454)
+++ tags/Ver2.2.2/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_upgrade.php	(revision 504)
@@ -15,5 +15,4 @@
 	if(get_xpress_latest_version()){
 		$latest = get_option('xpressme_latest_version');
-//print_r($latest);
 		if ($latest) {
 			$site_url=$latest['url'];
@@ -32,5 +31,4 @@
 			echo	'<h3 class="response">'. __('There is a new version of XPressME Integration Kit available for upgrade', 'xpressme') . '</h3>';
 			echo '<p>';
-	//		printf(__('You can upgrade to version %s automatically or download the package and install it manually:'),$latest_version);
 			printf(__('You can upgrade to version %s download the package and install it manually:', 'xpressme'),$latest_version);
 			echo '</p>';
@@ -51,4 +49,5 @@
 		}
 		
+		// develop
 		if ($latest['develop_response'] == 'development_exists'
 			&& !empty($latest['develop_package'])
@@ -61,4 +60,16 @@
 			printf(__('Download %s', 'xpressme') , $latest['develop_latest_version']);
 			echo '</a>';
+			// develop diff
+			if ($latest['diff_develop_response'] == 'diff_develop_exists'
+				&& !empty($latest['diff_develop_package'])
+				)
+			{
+					echo '<p>';
+					printf(__('You can download the differential file from version %s to %s and upgrade it manually:', 'xpressme'),$xpress_version,$latest['diff_develop_latest_version']);
+					echo '</p>';
+					echo '<a class="button" href="' . $latest['diff_develop_package'] . '">';
+						printf(__('Download differential file for %s', 'xpressme') , $latest['diff_develop_latest_version']);
+					echo '</a>';
+			}
 		}
 
@@ -141,4 +152,11 @@
 	if ( isset( $returns[15] ) ) $develop_latest_version = $returns[15]; else  $develop_latest_version = '';
 	if ( isset( $returns[16] ) ) $develop_lang = $returns[16]; else $develop_lang = '';
+	
+	// developer diff
+	if ( isset( $returns[18] ) ) $diff_develop_response = $returns[18]; else $diff_develop_response = '';
+	if ( isset( $returns[19] ) ) $diff_develop_url = clean_url( $returns[19] ); else $diff_develop_url = '';
+	if ( isset( $returns[20] ) ) $diff_develop_package = clean_url( $returns[20] ); else $diff_develop_package = '';
+	if ( isset( $returns[21] ) ) $diff_develop_latest_version = $returns[21]; else  $diff_develop_latest_version = '';
+	if ( isset( $returns[22] ) ) $diff_develop_lang = $returns[22]; else $diff_develop_lang = '';
 
 	$write_options = array (
@@ -158,4 +176,9 @@
 		'develop_latest_version' => $develop_latest_version ,
 		'develop_lang' => $develop_lang ,
+		'diff_develop_response' => $diff_develop_response ,
+		'diff_develop_url' => $diff_develop_url ,
+		'diff_develop_package' => $diff_develop_package ,
+		'diff_develop_latest_version' => $diff_develop_latest_version ,
+		'diff_develop_lang' => $diff_develop_lang ,
 		'check_time' => time()
 	);
