diff options
| author | David King <imkingdavid@gmail.com> | 2013-09-10 15:48:29 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-09-10 15:48:29 -0700 |
| commit | fc1dfd779da37128382322ffdc75bf751a0834a3 (patch) | |
| tree | 5d43d1847832169510c55c3358c42ccd095b2128 /phpBB/phpbb/auth/auth.php | |
| parent | 71aeec40f6c4c5e6a69699486b618c2ba67dff2d (diff) | |
| parent | 18f6a161017f5350d9487181f4b4ed66a53a0284 (diff) | |
| download | forums-fc1dfd779da37128382322ffdc75bf751a0834a3.tar forums-fc1dfd779da37128382322ffdc75bf751a0834a3.tar.gz forums-fc1dfd779da37128382322ffdc75bf751a0834a3.tar.bz2 forums-fc1dfd779da37128382322ffdc75bf751a0834a3.tar.xz forums-fc1dfd779da37128382322ffdc75bf751a0834a3.zip | |
Merge remote-tracking branch 'Hardolaf/feature/oauth' into develop
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) { |