diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-12 11:56:36 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-12 11:56:36 -0500 |
| commit | d9fdf41ad8638df5ff565ad097982f13f004e5d0 (patch) | |
| tree | 7b2c14d7b5db7482886180060e260db61ab9cf3c /phpBB/phpbb/auth/auth.php | |
| parent | 4c00c77739cc20db26d5f87bf26a9a953bc92d3a (diff) | |
| parent | f74a04c976c96864947bb91304abb3b92161f161 (diff) | |
| download | forums-d9fdf41ad8638df5ff565ad097982f13f004e5d0.tar forums-d9fdf41ad8638df5ff565ad097982f13f004e5d0.tar.gz forums-d9fdf41ad8638df5ff565ad097982f13f004e5d0.tar.bz2 forums-d9fdf41ad8638df5ff565ad097982f13f004e5d0.tar.xz forums-d9fdf41ad8638df5ff565ad097982f13f004e5d0.zip | |
Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832
# By Joseph Warner (187) and others
# Via Andreas Fischer (2) and others
* 'develop' of github.com:phpbb/phpbb3: (189 commits)
[ticket/11835] Fix ucp_auth_link adding in migration
[prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
[feature/oauth] Fix tabindex
[feature/oauth] Fix bug on ucp_auth_link related to error display
[feature/oauth] More small fixes
[feature/oauth] More minor changes from review
[feature/oauth] Fix small bug introduced by update in OAuth library
[feature/oauth] Fix small issues on ucp pages
[feature/oauth] Fix typo in OAuth logout method
[feature/oauth] Make token storage service ignorant
[feature/oauth] Update oauth::logout() to use clearAllTokens()
[feature/oauth] Update storage implementation due to inteface change
[feature/oauth] Update lusitanian/oauth to stable branch
[feature/oauth] Update comment on oauth service exception
[feature/oauth] Forgot to remove placeholder comment
[feature/oauth] OAuth service exception
[feature/oauth] A few more minor changes
[feature/oauth] Changes due to code review
[feature/oauth] Fix redirects
[feature/oauth] Fix issues on ucp_login_link from review
...
Diffstat (limited to 'phpBB/phpbb/auth/auth.php')
| -rw-r--r-- | phpBB/phpbb/auth/auth.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/phpbb/auth/auth.php b/phpBB/phpbb/auth/auth.php index 279959974d..81f8c76fc8 100644 --- a/phpBB/phpbb/auth/auth.php +++ b/phpBB/phpbb/auth/auth.php @@ -970,6 +970,18 @@ class phpbb_auth ); } + // If the auth provider wants us to link an empty account do so and redirect + if ($login['status'] == LOGIN_SUCCESS_LINK_PROFILE) + { + // If this status exists a fourth field is in the $login array called 'redirect_data' + // This data is passed along as GET data to the next page allow the account to be linked + + $params = array('mode' => 'login_link'); + $url = append_sid($phpbb_root_path . 'ucp.' . $phpEx, array_merge($params, $login['redirect_data'])); + + redirect($url); + } + // If login succeeded, we will log the user in... else we pass the login array through... if ($login['status'] == LOGIN_SUCCESS) { |