diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2009-10-07 14:54:10 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2009-10-07 14:54:10 +0000 |
| commit | 457a195797d562d93c5eed46f5e0ab34c7efdfde (patch) | |
| tree | 85491ba092335a8678e419462dd3393465bd9fdb | |
| parent | aef6352a35d3024a55ff7397e3f185df98982046 (diff) | |
| download | forums-457a195797d562d93c5eed46f5e0ab34c7efdfde.tar forums-457a195797d562d93c5eed46f5e0ab34c7efdfde.tar.gz forums-457a195797d562d93c5eed46f5e0ab34c7efdfde.tar.bz2 forums-457a195797d562d93c5eed46f5e0ab34c7efdfde.tar.xz forums-457a195797d562d93c5eed46f5e0ab34c7efdfde.zip | |
Properly fix #40925
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10216 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/acp/acp_profile.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/functions_profile_fields.php | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index 1b0ec4b5d5..fc08c7e8e8 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -509,6 +509,14 @@ class acp_profile // Get the number of options if this key is 'field_maxlen' $var = request_var('field_default_value', 0); }*/ + else if ($field_type == FIELD_INT && $key == 'field_default_value') + { + // Permit an empty string + if (request_var('field_default_value', '') === '') + { + $var = ''; + } + } $cp->vars[$key] = $var; } diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php index 9e356414a9..db1925bdcc 100644 --- a/phpBB/includes/functions_profile_fields.php +++ b/phpBB/includes/functions_profile_fields.php @@ -624,7 +624,7 @@ class custom_profile } else { - if (!$preview && isset($user->profile_fields[$user_ident]) && is_null($user->profile_fields[$user_ident])) + if (!$preview && array_key_exists($user_ident, $user->profile_fields) && is_null($user->profile_fields[$user_ident])) { $value = NULL; } |