makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2018-10-08 22:28:06 +02:00
commit 0b16ded3ca
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/functions.php
View file

@ -2351,10 +2351,12 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
* @event core.login_box_redirect * @event core.login_box_redirect
* @var string redirect Redirect string * @var string redirect Redirect string
* @var bool admin Is admin? * @var bool admin Is admin?
* @var array result Result from auth provider
* @since 3.1.0-RC5 * @since 3.1.0-RC5
* @changed 3.1.9-RC1 Removed undefined return variable * @changed 3.1.9-RC1 Removed undefined return variable
* @changed 3.2.4-RC1 Added result
*/ */
$vars = array('redirect', 'admin'); $vars = array('redirect', 'admin', 'result');
extract($phpbb_dispatcher->trigger_event('core.login_box_redirect', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.login_box_redirect', compact($vars)));
// append/replace SID (may change during the session for AOL users) // append/replace SID (may change during the session for AOL users)