mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-07 16:15:22 +02:00
Code Issues Releases Wiki Activity

[ticket/12791] String profile fields do not use links ...

Browse Source 
smilies and line breaks in memberlist

The value is overwritten with the contact value
Added aditional check if the field is a contact so we don't overwrite it.

PHPBB3-12791
This commit is contained in:
Stanislav Atanasov 2014-07-10 07:44:09 +03:00
parent d5fd1ecfc8
commit 690de21134
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/phpbb/profilefields/manager.php
View File

@ -390,6 +390,7 @@ class manager
$profile_field = $this->type_collection[$ident_ary['data']['field_type']]; $profile_field = $this->type_collection[$ident_ary['data']['field_type']];
$value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']); $value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']);
$value_raw = $profile_field->get_profile_value_raw($ident_ary['value'], $ident_ary['data']); $value_raw = $profile_field->get_profile_value_raw($ident_ary['value'], $ident_ary['data']);
$is_contact = $ident_ary['data']['field_is_contact'];
if ($value === null) if ($value === null)
{ {
@ -397,7 +398,7 @@ class manager
} }
$field_desc = $contact_url = ''; $field_desc = $contact_url = '';
if ($use_contact_fields) if ($use_contact_fields && $is_contact)
{ {
$value = $profile_field->get_profile_contact_value($ident_ary['value'], $ident_ary['data']); $value = $profile_field->get_profile_contact_value($ident_ary['value'], $ident_ary['data']);
$field_desc = $this->user->lang($ident_ary['data']['field_contact_desc']); $field_desc = $this->user->lang($ident_ary['data']['field_contact_desc']);