makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12793] Tests (added and changed)
  [ticket/12793] Changing get_profile_contact_value to get_profile_value_raw
  [ticket/12793] String '0' does not display for string profile fields
This commit is contained in:
Joas Schilling 2014-07-27 20:12:13 +02:00
commit 577186db7a
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/phpbb/profilefields/type/type_string_common.php
View file

@ -98,7 +98,7 @@ abstract class type_string_common extends type_base
*/ */
public function get_profile_value($field_value, $field_data) public function get_profile_value($field_value, $field_data)
{ {
if (!$field_value && !$field_data['field_show_novalue']) if (($field_value === null || $field_value === '') && !$field_data['field_show_novalue'])
{ {
return null; return null;
} }
@ -114,7 +114,7 @@ abstract class type_string_common extends type_base
*/ */
public function get_profile_value_raw($field_value, $field_data) public function get_profile_value_raw($field_value, $field_data)
{ {
if (!$field_value && !$field_data['field_show_novalue']) if (($field_value === null || $field_value === '') && !$field_data['field_show_novalue'])
{ {
return null; return null;
} }
@ -127,12 +127,7 @@ abstract class type_string_common extends type_base
*/ */
public function get_profile_contact_value($field_value, $field_data) public function get_profile_contact_value($field_value, $field_data)
{ {
if (!$field_value && !$field_data['field_show_novalue']) return $this->get_profile_value_raw($field_value, $field_data);
{
return null;
}
return $field_value;
} }
/** /**

10
tests/profilefields/type_string_test.php
View file

@ -249,8 +249,14 @@ class phpbb_profilefield_type_string_test extends phpbb_test_case
array( array(
0, 0,
array('field_show_novalue' => false), array('field_show_novalue' => false),
null, 0,
'Field should return null for empty integer without show_novalue', 'Field should return value of integer 0 without show_novalue',
),
array(
'0',
array('field_show_novalue' => false),
'0',
'Field should return string 0',
), ),
array( array(
0, 0,