makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04: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-28 16:21:58 +01:00
commit 89d0d2828f
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
phpBB/includes/ucp/ucp_login_link.php
View file

@ -39,7 +39,7 @@ class ucp_login_link
*/ */
function main($id, $mode) function main($id, $mode)
{ {
global $phpbb_container, $request, $template, $user; global $phpbb_container, $request, $template, $user, $phpbb_dispatcher;
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
// Initialize necessary variables // Initialize necessary variables
@ -108,7 +108,7 @@ class ucp_login_link
} }
} }
$template->assign_vars(array( $tpl_ary = array(
// Common template elements // Common template elements
'LOGIN_LINK_ERROR' => $login_link_error, 'LOGIN_LINK_ERROR' => $login_link_error,
'PASSWORD_CREDENTIAL' => 'login_password', 'PASSWORD_CREDENTIAL' => 'login_password',
@ -121,7 +121,24 @@ class ucp_login_link
// Login elements // Login elements
'LOGIN_ERROR' => $login_error, 'LOGIN_ERROR' => $login_error,
'LOGIN_USERNAME' => $login_username, 'LOGIN_USERNAME' => $login_username,
)); );
/**
* Event to perform additional actions before ucp_login_link is displayed
*
* @event core.ucp_login_link_template_after
* @var array data Login link data
* @var \phpbb\auth\provider_interface auth_provider Auth provider
* @var string login_link_error Login link error
* @var string login_error Login error
* @var string login_username Login username
* @var array tpl_ary Template variables
* @since 3.2.4-RC1
*/
$vars = array('data', 'auth_provider', 'login_link_error', 'login_error', 'login_username', 'tpl_ary');
extract($phpbb_dispatcher->trigger_event('core.ucp_login_link_template_after', compact($vars)));
$template->assign_vars($tpl_ary);
$this->tpl_name = 'ucp_login_link'; $this->tpl_name = 'ucp_login_link';
$this->page_title = 'UCP_LOGIN_LINK'; $this->page_title = 'UCP_LOGIN_LINK';