Index: trunk/wp-content/plugins/xpressme/include/pluggable-override.php
===================================================================
--- trunk/wp-content/plugins/xpressme/include/pluggable-override.php	(revision 86)
+++ trunk/wp-content/plugins/xpressme/include/pluggable-override.php	(revision 87)
@@ -21,11 +21,11 @@
 
 
-	if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST )
-		return false;
+	if ($xoopsModule){
+		if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST )
+			return false;
 
-	if ( ! empty($current_user) )
-		return;
+		if ( ! empty($current_user) )
+			return;
 
-	if ($xoopsModule){
 		if (check_xpress_auth_cookie()){	//The cookie is login user's or it checks it
 			if ( $user = wp_validate_auth_cookie() ) {
@@ -34,5 +34,5 @@
 			}
 		}				
-		xpress_login();		
+		xpress_login();	
 
 	} else {
@@ -59,26 +59,25 @@
 	global $current_user;
 	
-			if(is_object($GLOBALS["xoopsUser"])){
-				$u_name = $GLOBALS["xoopsUser"]->getVar("uname");
-				$u_pass_md5 = $GLOBALS["xoopsUser"]->getVar("pass");	
-				if ( ! empty($u_name) && ! empty($u_pass_md5) ) {
-					include_once dirname( __FILE__ ).'/user_sync_xoops.php';
-					$messege = '';
-					$ret = user_sync_to_wordpress($GLOBALS["xoopsUser"]->getVar("uid"),$messege);
-					if ($ret){
-						$user = new WP_User(0, $u_name);
-						if ( wp_login($u_name, $u_pass_md5) ) {
-							wp_setcookie($u_name, $u_pass_md5, true, '', '', false);
-							do_action('wp_login', $u_name);
-							wp_set_current_user($user->ID);
-							return  true;
-						}
-					}else {
-						// echo $messege;
-					}
+	if(is_object($GLOBALS["xoopsUser"])){
+		$u_name = $GLOBALS["xoopsUser"]->getVar("uname");
+		$u_pass_md5 = $GLOBALS["xoopsUser"]->getVar("pass");	
+		if ( ! empty($u_name) && ! empty($u_pass_md5) ) {
+			include_once dirname( __FILE__ ).'/user_sync_xoops.php';
+			repair_user_meta_prefix();  //Repair when data base prefix is changed on XOOPS side
+			$messege = '';
+			$ret = user_sync_to_wordpress($GLOBALS["xoopsUser"]->getVar("uid"),$messege);
+			if ($ret){
+				$user = new WP_User(0, $u_name);
+				if ( wp_login($u_name, $u_pass_md5) ) {
+					wp_setcookie($u_name, $u_pass_md5, true, '', '', false);
+					do_action('wp_login', $u_name);
+					wp_set_current_user($user->ID);
+					return  true;
 				}
 			}
-		wp_set_current_user(0);
-		return 0;	
+		}
+	}
+	wp_set_current_user(0);
+	return 0;	
 }