makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

small update only fixing two obvious bugs

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4987 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2004-09-19 20:40:20 +00:00
parent 8906e07d41
commit 310edb4eb8
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
phpBB/adm/admin_profile.php
View file

@ -239,9 +239,15 @@ if ($mode == 'create' || $mode == 'edit')
// step 2 // step 2
foreach ($exclude[2] as $key) foreach ($exclude[2] as $key)
{ {
if ($key == 'field_required' || $key == 'field_hide' || $key == 'field_show_on_reg') if ($key == 'field_required' || $key == 'field_show_on_reg' || $key == 'field_hide')
{ {
$var = (isset($_REQUEST[$key])) ? request_var($key, 0) : $field_row[$key]; $var = (!$submit && $step == 1) ? $field_row[$key] : request_var($key, 0);
// Damn checkboxes...
if (!$submit && $step == 1)
{
$_REQUEST[$key] = $var;
}
} }
else else
{ {
@ -499,7 +505,6 @@ if ($mode == 'create' || $mode == 'edit')
break; break;
case 2: case 2:
?> ?>
<tr> <tr>
<td class="row1"><b><?php echo $user->lang['REQUIRED_FIELD']; ?></b><br /><span class="gensmall"><?php echo $user->lang['REQUIRED_FIELD_EXPLAIN']; ?></span></td> <td class="row1"><b><?php echo $user->lang['REQUIRED_FIELD']; ?></b><br /><span class="gensmall"><?php echo $user->lang['REQUIRED_FIELD_EXPLAIN']; ?></span></td>
@ -1225,16 +1230,9 @@ function build_hidden_fields($key_ary)
foreach ($key_ary as $key) foreach ($key_ary as $key)
{ {
$var = isset($_POST[$key]) ? $_POST[$key] : false; $var = isset($_REQUEST[$key]) ? $_REQUEST[$key] : false;
if ($key == 'field_required' || $key == 'field_hide' || $key == 'field_show_on_reg') if ($var === false)
{
if (!$var)
{
$var = 0;
}
}
else if (!$var)
{ {
continue; continue;
} }

6
phpBB/includes/functions_profile_fields.php
View file

@ -105,14 +105,14 @@ class custom_profile
break; break;
case 'FIELD_TOO_SHORT': case 'FIELD_TOO_SHORT':
case 'FIELD_TOO_SMALL': case 'FIELD_TOO_SMALL':
$error = sprintf($user->lang[$cp_result], $row['lang_name'], $field_data['field_minlen']); $error = sprintf($user->lang[$cp_result], $row['lang_name'], $row['field_minlen']);
break; break;
case 'FIELD_TOO_LONG': case 'FIELD_TOO_LONG':
case 'FIELD_TOO_LARGE': case 'FIELD_TOO_LARGE':
$error = sprintf($user->lang[$cp_result], $row['lang_name'], $field_data['field_maxlen']); $error = sprintf($user->lang[$cp_result], $row['lang_name'], $row['field_maxlen']);
break; break;
case 'FIELD_INVALID_CHARS': case 'FIELD_INVALID_CHARS':
switch ($field_data['field_validation']) switch ($row['field_validation'])
{ {
case '[0-9]+': case '[0-9]+':
$error = sprintf($user->lang[$cp_result . '_NUMBERS_ONLY'], $row['lang_name']); $error = sprintf($user->lang[$cp_result . '_NUMBERS_ONLY'], $row['lang_name']);