mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-03 23:37:39 +02:00
merge revisions #r8384, #r8387, #r8388, #r8389 and #r8390
git-svn-id: file:///svn/phpbb/trunk@8391 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -873,13 +873,13 @@ class custom_profile
|
||||
}
|
||||
else
|
||||
{
|
||||
$var = request_var($var_name, $profile_row['field_default_value']);
|
||||
$var = request_var($var_name, (int) $profile_row['field_default_value']);
|
||||
}
|
||||
break;
|
||||
|
||||
case FIELD_STRING:
|
||||
case FIELD_TEXT:
|
||||
$var = utf8_normalize_nfc(request_var($var_name, $profile_row['field_default_value'], true));
|
||||
$var = utf8_normalize_nfc(request_var($var_name, (string) $profile_row['field_default_value'], true));
|
||||
break;
|
||||
|
||||
case FIELD_INT:
|
||||
@@ -889,10 +889,14 @@ class custom_profile
|
||||
}
|
||||
else
|
||||
{
|
||||
$var = request_var($var_name, $profile_row['field_default_value']);
|
||||
$var = request_var($var_name, (int) $profile_row['field_default_value']);
|
||||
}
|
||||
break;
|
||||
|
||||
case FIELD_DROPDOWN:
|
||||
$var = request_var($var_name, (int) $profile_row['field_default_value']);
|
||||
break;
|
||||
|
||||
default:
|
||||
$var = request_var($var_name, $profile_row['field_default_value']);
|
||||
break;
|
||||
|
Reference in New Issue
Block a user