openinfra
/
groups
Code Issues Proposed changes

Fix Memory exhausted issue prevents user login bug 

A change of user name query in commons_activity_streams_tokens
caused this issue together with groups_oauth2 user name format
hook.

Change-Id: I5bada07939cfb6c46acba3eb6e77f0455b5e0b96
Story: 2000224
This commit is contained in:
Marton Kiss 2015-03-30 14:29:37 +02:00
parent ca10b29ce4
commit 1f985c7cc7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/groups/groups_oauth2/groups_oauth2.module
View File

@ -310,10 +310,8 @@ function groups_oauth2_username_alter(&$name, $account) {
// Don't alter anonymous users or objects that do not have any user ID.
return;
}
$user_account = user_load($account->uid);
// Name was loaded/generated via hook_user_load(), so re-use it.
if (isset($user_account->data['oauth2_fullname'])) {
$name = $user_account->data['oauth2_fullname'];
if (isset($account->data['oauth2_fullname'])) {
$name = $account->data['oauth2_fullname'];
return;
}
// Real name was not yet available for the account so we need to generate it.