Merge "Fix oauth2 user profile name construction"
This commit is contained in:
commit
ddb7284910
@ -75,7 +75,7 @@ function groups_oauth2_response_handler() {
|
|||||||
drupal_goto();
|
drupal_goto();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$username = check_plain(strtolower($userinfo->name).'-'.strtolower($userinfo->family_name));
|
$username = check_plain(strtolower($userinfo->name));
|
||||||
$query = "SELECT uid FROM {users} WHERE name = :name";
|
$query = "SELECT uid FROM {users} WHERE name = :name";
|
||||||
$uid = db_query($query, array(':name' => $username))->fetchField();
|
$uid = db_query($query, array(':name' => $username))->fetchField();
|
||||||
$i = 0;
|
$i = 0;
|
||||||
@ -95,7 +95,7 @@ function groups_oauth2_response_handler() {
|
|||||||
'status' => 1,
|
'status' => 1,
|
||||||
'timezone' => variable_get('date_default_timezone'),
|
'timezone' => variable_get('date_default_timezone'),
|
||||||
'data' => array(
|
'data' => array(
|
||||||
'oauth2_fullname' => check_plain($userinfo->name.' '.$userinfo->family_name),
|
'oauth2_fullname' => check_plain($userinfo->name),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
$account = user_save(NULL, $edit);
|
$account = user_save(NULL, $edit);
|
||||||
|
Loading…
Reference in New Issue
Block a user