aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-10-15 12:49:51 +0200
committerrxu <rxu@mail.ru>2016-10-28 21:37:00 +0700
commit466bdee8e6652ae5594b503b264ea075204e48b6 (patch)
tree25e44cefecb9b6d79f2eda78acf655793fffaaac /phpBB/includes
parenta41b16d06ad6c4fe555d72165aca7b3e53b2a011 (diff)
downloadforums-466bdee8e6652ae5594b503b264ea075204e48b6.tar
forums-466bdee8e6652ae5594b503b264ea075204e48b6.tar.gz
forums-466bdee8e6652ae5594b503b264ea075204e48b6.tar.bz2
forums-466bdee8e6652ae5594b503b264ea075204e48b6.tar.xz
forums-466bdee8e6652ae5594b503b264ea075204e48b6.zip
[ticket/14823] Move check_form_key() inside actual save data step
PHPBB3-14823
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_profile.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index f796900bf0..2012d3c513 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -597,13 +597,13 @@ class acp_profile
if (!sizeof($error))
{
- if (($submit || $save) && !check_form_key($form_key))
- {
- trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
- }
-
if (($step == 3 && (sizeof($this->lang_defs['iso']) == 1 || $save)) || ($action == 'edit' && $save))
{
+ if (!check_form_key($form_key))
+ {
+ trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+ }
+
$this->save_profile_field($cp, $field_type, $action);
}
}