mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00:00
Merge branch '3.2.x'
This commit is contained in:
commit
89d0d2828f
1 changed files with 20 additions and 3 deletions
|
@ -39,7 +39,7 @@ class ucp_login_link
|
|||
*/
|
||||
function main($id, $mode)
|
||||
{
|
||||
global $phpbb_container, $request, $template, $user;
|
||||
global $phpbb_container, $request, $template, $user, $phpbb_dispatcher;
|
||||
global $phpbb_root_path, $phpEx;
|
||||
|
||||
// Initialize necessary variables
|
||||
|
@ -108,7 +108,7 @@ class ucp_login_link
|
|||
}
|
||||
}
|
||||
|
||||
$template->assign_vars(array(
|
||||
$tpl_ary = array(
|
||||
// Common template elements
|
||||
'LOGIN_LINK_ERROR' => $login_link_error,
|
||||
'PASSWORD_CREDENTIAL' => 'login_password',
|
||||
|
@ -121,7 +121,24 @@ class ucp_login_link
|
|||
// Login elements
|
||||
'LOGIN_ERROR' => $login_error,
|
||||
'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->page_title = 'UCP_LOGIN_LINK';
|
||||
|
|
Loading…
Add table
Reference in a new issue