Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/user_sync_xoops.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/user_sync_xoops.php	(revision 580)
+++ trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/user_sync_xoops.php	(revision 581)
@@ -128,6 +128,5 @@
  * WP User ID exists is checked.. 
 */
-function set_user_role($uid=0,$new_user = false){
-	$roles = get_xoops_group_role($uid);
+function set_user_role($uid=0,$roles,$new_user = false){
 	
 	foreach($roles as $role){
@@ -211,4 +210,5 @@
 		$wp_user_id = get_wp_user_id($xoops_user->uname) ;
 
+		$roles = get_xoops_group_role($xoops_user->uid);
 
 		$has_role = has_group_role($xoops_user->uid);
@@ -236,6 +236,6 @@
 		$is_update = false;
 		
-		if ($wp_user_id){
-			$add_user =  true;
+		if ($wp_user_id){	
+			$new_user =  false;
 			$wu_sql  = 	"UPDATE $db_xpress_users ";
 			$wu_sql .= 	'SET ';
@@ -250,5 +250,5 @@
 			$xoops_db->query($wu_sql);
 			
-			$message .= set_user_role($wp_user_id,$add_user);
+			$message .= set_user_role($wp_user_id,$roles,$new_user);
 
 			if (!check_user_meta_prefix($wp_user_id)){
@@ -258,5 +258,5 @@
 			$is_update = true;
 		}else{
-			$add_user =  false;
+			$new_user =  true;
 			if (is_used_wp_user_id($xoops_user->uid) ) { // WP User ID has already been used. 
 				$wu_sql  =	"INSERT INTO $db_xpress_users ";
@@ -278,5 +278,5 @@
 				$wp_user_id = $xoops_user->uid;
 			}
-			$message .= set_user_role($wp_user_id,$add_user);
+			$message .= set_user_role($wp_user_id,$roles,$new_user);
 		}
 		
