aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-02-26 11:49:32 +0100
committerNils Adermann <naderman@naderman.de>2014-02-26 11:49:32 +0100
commitf99cce0f440ad3d0176d6317092707383bfd456c (patch)
tree030fe83a623390e07017775cd4925dc98e673795 /phpBB/phpbb
parent4b7932e8b321771c1a5e108c229512f64032624b (diff)
parentae98810ddcfb3aed870bd9392e1882083058288e (diff)
downloadforums-f99cce0f440ad3d0176d6317092707383bfd456c.tar
forums-f99cce0f440ad3d0176d6317092707383bfd456c.tar.gz
forums-f99cce0f440ad3d0176d6317092707383bfd456c.tar.bz2
forums-f99cce0f440ad3d0176d6317092707383bfd456c.tar.xz
forums-f99cce0f440ad3d0176d6317092707383bfd456c.zip
Merge pull request #2060 from nickvergessen/ticket/12205-develop
[ticket/12205-Develop] Do not display 0 for empty integers when show_novalue is off
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/profilefields/type/type_int.php2
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;
}