diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-02-25 18:35:03 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-02-25 18:35:03 +0100 |
| commit | ae98810ddcfb3aed870bd9392e1882083058288e (patch) | |
| tree | 030fe83a623390e07017775cd4925dc98e673795 /phpBB/phpbb/profilefields | |
| parent | 4b7932e8b321771c1a5e108c229512f64032624b (diff) | |
| parent | ffbc7ccb64f28c0932f4ec09a94379e968224945 (diff) | |
| download | forums-ae98810ddcfb3aed870bd9392e1882083058288e.tar forums-ae98810ddcfb3aed870bd9392e1882083058288e.tar.gz forums-ae98810ddcfb3aed870bd9392e1882083058288e.tar.bz2 forums-ae98810ddcfb3aed870bd9392e1882083058288e.tar.xz forums-ae98810ddcfb3aed870bd9392e1882083058288e.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/12205' into ticket/12205-develop
* nickvergessen/ticket/12205:
[ticket/12205] Do not display 0 for empty integers when show_novalue is off
Conflicts:
phpBB/includes/functions_profile_fields.php
Diffstat (limited to 'phpBB/phpbb/profilefields')
| -rw-r--r-- | phpBB/phpbb/profilefields/type/type_int.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/profilefields/type/type_int.php b/phpBB/phpbb/profilefields/type/type_int.php index b89faca018..267f522d5d 100644 --- a/phpBB/phpbb/profilefields/type/type_int.php +++ b/phpBB/phpbb/profilefields/type/type_int.php @@ -141,7 +141,7 @@ class type_int extends type_base */ public function get_profile_value($field_value, $field_data) { - if ($field_value === '' && !$field_data['field_show_novalue']) + if (($field_value === '' || $field_value === null) && !$field_data['field_show_novalue']) { return null; } |