mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 07:35:29 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
* 3.1.x:
  [ticket/13960] Profile field validation breaks ACP
This commit is contained in:
Tristan Darricau 2015-10-08 15:42:55 +02:00
commit 6e90311550
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
phpBB/includes/acp/acp_profile.php
View File

@ -543,13 +543,14 @@ class acp_profile
} }
} }
$step = (isset($_REQUEST['next'])) ? $step + 1 : ((isset($_REQUEST['prev'])) ? $step - 1 : $step);
if (sizeof($error)) if (sizeof($error))
{ {
$step--;
$submit = false; $submit = false;
} }
else
{
$step = (isset($_REQUEST['next'])) ? $step + 1 : ((isset($_REQUEST['prev'])) ? $step - 1 : $step);
}
// Build up the specific hidden fields // Build up the specific hidden fields
foreach ($exclude as $num => $key_ary) foreach ($exclude as $num => $key_ary)
@ -567,7 +568,7 @@ class acp_profile
$var = $profile_field->prepare_hidden_fields($step, $key, $action, $field_data); $var = $profile_field->prepare_hidden_fields($step, $key, $action, $field_data);
if ($var !== null) if ($var !== null)
{ {
$_new_key_ary[$key] = $profile_field->prepare_hidden_fields($step, $key, $action, $field_data); $_new_key_ary[$key] = $var;
} }
} }
$cp->vars = $field_data; $cp->vars = $field_data;
@ -577,11 +578,7 @@ class acp_profile
if (!sizeof($error)) if (!sizeof($error))
{ {
if ($step == 3 && (sizeof($this->lang_defs['iso']) == 1 || $save)) if (($step == 3 && (sizeof($this->lang_defs['iso']) == 1 || $save)) || ($action == 'edit' && $save))
{
$this->save_profile_field($cp, $field_type, $action);
}
else if ($action == 'edit' && $save)
{ {
$this->save_profile_field($cp, $field_type, $action); $this->save_profile_field($cp, $field_type, $action);
} }