mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-23 00:50:30 +01:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Derky 2017-12-18 00:07:13 +01:00
commit bcbfd75719
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
phpBB/includes/ucp/ucp_register.php
View File

@ -166,7 +166,8 @@ class ucp_register
->format($user->lang['DATE_FORMAT'], true);
unset($now);
$template->assign_vars(array(
$template_vars = array(
'S_LANG_OPTIONS' => (count($lang_row) > 1) ? language_select($user_lang) : '',
'L_COPPA_NO' => sprintf($user->lang['UCP_COPPA_BEFORE'], $coppa_birthday),
'L_COPPA_YES' => sprintf($user->lang['UCP_COPPA_ON_AFTER'], $coppa_birthday),
@ -180,11 +181,12 @@ class ucp_register
'COOKIE_NAME' => $config['cookie_name'],
'COOKIE_PATH' => $config['cookie_path'],
));
);
}
else
{
$template->assign_vars(array(
$template_vars = array(
'S_LANG_OPTIONS' => (count($lang_row) > 1) ? language_select($user_lang) : '',
'L_TERMS_OF_USE' => sprintf($user->lang['TERMS_OF_USE_CONTENT'], $config['sitename'], generate_board_url()),
@ -195,11 +197,32 @@ class ucp_register
'COOKIE_NAME' => $config['cookie_name'],
'COOKIE_PATH' => $config['cookie_path'],
)
);
}
$tpl_name = 'ucp_agreement';
/**
* Allows to modify the agreements.
*
* @event core.ucp_register_agreement_modify_template_data
* @var string tpl_name Template file
* @var array template_vars Array with data about to be assigned to the template
* @var array s_hidden_fields Array with hidden form elements
* @var array lang_row Array with available languages, read only
* @since 3.2.2-RC1
*/
$vars = array('tpl_name', 'template_vars', 's_hidden_fields', 'lang_row');
extract($phpbb_dispatcher->trigger_event('core.ucp_register_agreement_modify_template_data', compact($vars)));
unset($lang_row);
$template_vars = array_merge($template_vars, array(
'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields),
));
$template->assign_vars($template_vars);
/**
* Allows to modify the agreements.
*
@ -207,10 +230,11 @@ class ucp_register
*
* @event core.ucp_register_agreement
* @since 3.1.6-RC1
* @deprecated 3.2.2-RC1 Replaced by core.ucp_register_agreement_modify_template_data and to be removed in 3.3.0-RC1
*/
$phpbb_dispatcher->dispatch('core.ucp_register_agreement');
$this->tpl_name = 'ucp_agreement';
$this->tpl_name = $tpl_name;
return;
}