From f274357ad6d221fd6ab867aeb0374469b342368d Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 26 Dec 2018 11:21:42 +0000 Subject: [PATCH] Issue-6329: Prevent double encoding --- src/Model/Profile.php | 6 ++---- src/Module/Contact.php | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 8267674e52..887e35b721 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -512,10 +512,8 @@ class Profile $p['about'] = BBCode::convert($p['about']); } - if (isset($p['address'])) { - $p['address'] = BBCode::convert($p['address']); - } elseif (isset($p['location'])) { - $p['address'] = BBCode::convert($p['location']); + if (empty($p['address']) && !empty($p['location'])) { + $p['address'] = $p['location']; } if (isset($p['photo'])) { diff --git a/src/Module/Contact.php b/src/Module/Contact.php index fa88c0ea06..c030f60f46 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -643,7 +643,7 @@ class Contact extends BaseModule '$profileurllabel'=> L10n::t('Profile URL'), '$profileurl' => $contact['url'], '$account_type' => Model\Contact::getAccountType($contact), - '$location' => BBCode::convert($contact['location']), + '$location' => $contact['location'], '$location_label' => L10n::t('Location:'), '$xmpp' => BBCode::convert($contact['xmpp']), '$xmpp_label' => L10n::t('XMPP:'),