diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-03-09 04:42:05 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-03-09 04:42:05 -0500 |
| commit | 0ec8e9dbff7d71e9a60ec8de8a15ba8f28ccdc04 (patch) | |
| tree | 7ef751b1be44853759422f2ed4e5a00dc6b60026 /phpBB/includes/functions_profile_fields.php | |
| parent | d380a1a36ffd5b2de6e403eb63f8754d8a277386 (diff) | |
| parent | cd61de4bfdd1818d173e7413e53d8fd3d7ce1913 (diff) | |
| download | forums-0ec8e9dbff7d71e9a60ec8de8a15ba8f28ccdc04.tar forums-0ec8e9dbff7d71e9a60ec8de8a15ba8f28ccdc04.tar.gz forums-0ec8e9dbff7d71e9a60ec8de8a15ba8f28ccdc04.tar.bz2 forums-0ec8e9dbff7d71e9a60ec8de8a15ba8f28ccdc04.tar.xz forums-0ec8e9dbff7d71e9a60ec8de8a15ba8f28ccdc04.zip | |
Merge remote-tracking branch 'rxu/ticket/9084' into develop-olympus
* rxu/ticket/9084:
[ticket/9084] Explain the logic.
[ticket/9084] Don't hide 'non-entered' dropdown CPF value if not required
Diffstat (limited to 'phpBB/includes/functions_profile_fields.php')
| -rw-r--r-- | phpBB/includes/functions_profile_fields.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php index 1eae2a9ad6..d44be16184 100644 --- a/phpBB/includes/functions_profile_fields.php +++ b/phpBB/includes/functions_profile_fields.php @@ -571,7 +571,12 @@ class custom_profile $this->get_option_lang($field_id, $lang_id, FIELD_DROPDOWN, false); } - if ($value == $ident_ary['data']['field_novalue']) + // If a dropdown field is required, users + // cannot choose the "no value" option. + // They must choose one of the other options. + // Therefore, here we treat a value equal to + // the "no value" as a lack of value, i.e. NULL. + if ($value == $ident_ary['data']['field_novalue'] && $ident_ary['data']['field_required']) { return NULL; } |