1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00

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
This commit is contained in:
Joas Schilling
2014-02-25 18:35:03 +01:00
2 changed files with 43 additions and 1 deletions

View File

@@ -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;
}