diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-10-23 11:48:56 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-10-23 11:48:56 +0200 |
| commit | 2a038d45df982611811741211dd9ba953a4a9c5a (patch) | |
| tree | 1c6df2295dc841a8364bfa62d237efacf49198d1 /phpBB | |
| parent | fd7244c892cdacbe85886c5c2a0a8571489650c5 (diff) | |
| parent | 3cb09358fef0a96489c19850ddb93ad65b0306ff (diff) | |
| download | forums-2a038d45df982611811741211dd9ba953a4a9c5a.tar forums-2a038d45df982611811741211dd9ba953a4a9c5a.tar.gz forums-2a038d45df982611811741211dd9ba953a4a9c5a.tar.bz2 forums-2a038d45df982611811741211dd9ba953a4a9c5a.tar.xz forums-2a038d45df982611811741211dd9ba953a4a9c5a.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index da698ae4cb..61573c0cc9 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2021,8 +2021,9 @@ function check_link_hash($token, $link_name) /** * Add a secret token to the form (requires the S_FORM_TOKEN template variable) * @param string $form_name The name of the form; has to match the name used in check_form_key, otherwise no restrictions apply +* @param string $template_variable_suffix A string that is appended to the name of the template variable to which the form elements are assigned */ -function add_form_key($form_name) +function add_form_key($form_name, $template_variable_suffix = '') { global $config, $template, $user, $phpbb_dispatcher; @@ -2039,13 +2040,15 @@ function add_form_key($form_name) * Perform additional actions on creation of the form token * * @event core.add_form_key - * @var string form_name The form name - * @var int now Current time timestamp - * @var string s_fields Generated hidden fields - * @var string token Form token - * @var string token_sid User session ID + * @var string form_name The form name + * @var int now Current time timestamp + * @var string s_fields Generated hidden fields + * @var string token Form token + * @var string token_sid User session ID + * @var string template_variable_suffix The string that is appended to template variable name * * @since 3.1.0-RC3 + * @changed 3.1.11-RC1 Added template_variable_suffix */ $vars = array( 'form_name', @@ -2053,12 +2056,11 @@ function add_form_key($form_name) 's_fields', 'token', 'token_sid', + 'template_variable_suffix', ); extract($phpbb_dispatcher->trigger_event('core.add_form_key', compact($vars))); - $template->assign_vars(array( - 'S_FORM_TOKEN' => $s_fields, - )); + $template->assign_var('S_FORM_TOKEN' . $template_variable_suffix, $s_fields); } /** |