diff options
| author | Stanislav Atanasov <lucifer@anavaro.com> | 2014-07-10 07:44:09 +0300 |
|---|---|---|
| committer | Stanislav Atanasov <lucifer@anavaro.com> | 2014-07-10 11:42:31 +0300 |
| commit | 690de2113433e0330ca53f928f6b923ea36d41c1 (patch) | |
| tree | 734e07c9f2cbd65e4b72f326985f1a10b744b9ae | |
| parent | d5fd1ecfc8c2898d57135cccb06b62e9c28f1ce2 (diff) | |
| download | forums-690de2113433e0330ca53f928f6b923ea36d41c1.tar forums-690de2113433e0330ca53f928f6b923ea36d41c1.tar.gz forums-690de2113433e0330ca53f928f6b923ea36d41c1.tar.bz2 forums-690de2113433e0330ca53f928f6b923ea36d41c1.tar.xz forums-690de2113433e0330ca53f928f6b923ea36d41c1.zip | |
[ticket/12791] String profile fields do not use links ...
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
| -rw-r--r-- | phpBB/phpbb/profilefields/manager.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php index f3b1676799..c79e13c958 100644 --- a/phpBB/phpbb/profilefields/manager.php +++ b/phpBB/phpbb/profilefields/manager.php @@ -390,6 +390,7 @@ class manager $profile_field = $this->type_collection[$ident_ary['data']['field_type']]; $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']); + $is_contact = $ident_ary['data']['field_is_contact']; if ($value === null) { @@ -397,7 +398,7 @@ class manager } $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']); $field_desc = $this->user->lang($ident_ary['data']['field_contact_desc']); |