diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-01 10:09:39 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-01 10:09:39 +0200 |
| commit | 9ad7eddc25f7df6e6cc988d8ceb776b8947ac3a0 (patch) | |
| tree | 5f1130c1382524a9c5de068bbd428d3ecb4b69ab /phpBB | |
| parent | b99ba4d41664e00373075e3cd4380965d3a47d77 (diff) | |
| parent | 994a0dcd4c444c7902f85355efba3a9a6b06f78e (diff) | |
| download | forums-9ad7eddc25f7df6e6cc988d8ceb776b8947ac3a0.tar forums-9ad7eddc25f7df6e6cc988d8ceb776b8947ac3a0.tar.gz forums-9ad7eddc25f7df6e6cc988d8ceb776b8947ac3a0.tar.bz2 forums-9ad7eddc25f7df6e6cc988d8ceb776b8947ac3a0.tar.xz forums-9ad7eddc25f7df6e6cc988d8ceb776b8947ac3a0.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 22c1a092b5..a502314ded 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2768,7 +2768,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = false, $s_display = true) { global $db, $user, $template, $auth, $phpEx, $phpbb_root_path, $config; - global $request, $phpbb_container; + global $request, $phpbb_container, $phpbb_dispatcher; $err = ''; @@ -2854,6 +2854,18 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa { $redirect = request_var('redirect', "{$phpbb_root_path}index.$phpEx"); + /** + * This event allows an extension to modify the redirection when a user successfully logs in + * + * @event core.login_box_redirect + * @var string redirect Redirect string + * @var boolean admin Is admin? + * @var bool return If true, do not redirect but return the sanitized URL. + * @since 3.1.0-RC5 + */ + $vars = array('redirect', 'admin', 'return'); + extract($phpbb_dispatcher->trigger_event('core.login_box_redirect', compact($vars))); + // append/replace SID (may change during the session for AOL users) $redirect = reapply_sid($redirect); |