diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-08-14 22:50:34 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-08-14 22:50:49 -0400 |
| commit | 43e08e221f9e70940249b93a229dcec0eb10059b (patch) | |
| tree | ddb87c14fb5b515b6b23c207c41cc4f74515155f | |
| parent | 0ea555bbc78597645cf024a5ba14bfd8149f512a (diff) | |
| download | forums-43e08e221f9e70940249b93a229dcec0eb10059b.tar forums-43e08e221f9e70940249b93a229dcec0eb10059b.tar.gz forums-43e08e221f9e70940249b93a229dcec0eb10059b.tar.bz2 forums-43e08e221f9e70940249b93a229dcec0eb10059b.tar.xz forums-43e08e221f9e70940249b93a229dcec0eb10059b.zip | |
[feature/oauth] Fix bug found in testing
PHPBB3-11673
| -rw-r--r-- | phpBB/includes/ucp/ucp_login_link.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_login_link.php b/phpBB/includes/ucp/ucp_login_link.php index b09415623b..e8e489fe5f 100644 --- a/phpBB/includes/ucp/ucp_login_link.php +++ b/phpBB/includes/ucp/ucp_login_link.php @@ -48,6 +48,9 @@ class ucp_login_link $auth_provider = 'auth.provider.' . $request->variable('auth_provider', $config['auth_method']); $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 $result = $auth_provider->login_link_has_necessary_data($data); if ($result !== null) @@ -73,9 +76,6 @@ class ucp_login_link // Give the user_id to the data $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 $result = $auth_provider->link_account($data); |