diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-10-28 21:06:21 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-10-28 21:06:21 +0200 |
| commit | f658e062b2c38127df34dfe1903f1f28946a9ae7 (patch) | |
| tree | 4c6f6a9b7f926aea4005e4873278ec0e4863b10f /phpBB/includes/acp/acp_profile.php | |
| parent | b8ef36ddb1b141ad71bd88a2edb8ac088f9b9b74 (diff) | |
| parent | 85898d3d2c7b5ce61a0f92299e06ceade000c4a8 (diff) | |
| download | forums-f658e062b2c38127df34dfe1903f1f28946a9ae7.tar forums-f658e062b2c38127df34dfe1903f1f28946a9ae7.tar.gz forums-f658e062b2c38127df34dfe1903f1f28946a9ae7.tar.bz2 forums-f658e062b2c38127df34dfe1903f1f28946a9ae7.tar.xz forums-f658e062b2c38127df34dfe1903f1f28946a9ae7.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/includes/acp/acp_profile.php')
| -rw-r--r-- | phpBB/includes/acp/acp_profile.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index c4888cfc7c..b09b496bc6 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -602,13 +602,13 @@ class acp_profile if (!sizeof($error)) { - if (!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); } } |