makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/oauth] Fix bug found in testing

Browse source 
PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-08-14 22:50:34 -04:00
parent 0ea555bbc7
commit 43e08e221f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/ucp/ucp_login_link.php
View file

@ -48,6 +48,9 @@ class ucp_login_link
$auth_provider = 'auth.provider.' . $request->variable('auth_provider', $config['auth_method']); $auth_provider = 'auth.provider.' . $request->variable('auth_provider', $config['auth_method']);
$auth_provider = $phpbb_container->get($auth_provider); $auth_provider = $phpbb_container->get($auth_provider);
// Set the link_method to login_link
$data['link_method'] = 'login_link';
// Have the authentication provider check that all necessary data is available // Have the authentication provider check that all necessary data is available
$result = $auth_provider->login_link_has_necessary_data($data); $result = $auth_provider->login_link_has_necessary_data($data);
if ($result !== null) if ($result !== null)
@ -73,9 +76,6 @@ class ucp_login_link
// Give the user_id to the data // Give the user_id to the data
$data['user_id'] = $login_result['user_row']['user_id']; $data['user_id'] = $login_result['user_row']['user_id'];
// Set the link_method to login_link
$data['link_method'] = 'login_link';
// The user is now logged in, attempt to link the user to the external account // The user is now logged in, attempt to link the user to the external account
$result = $auth_provider->link_account($data); $result = $auth_provider->link_account($data);