Issue-6329: Prevent double encoding

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 8267674e520e5dcc57cc78a1e6f2cefc7ea440be..887e35b72179a78e994affa7c577fc77eda6a79d 100644 (file)
--- 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 fa88c0ea069f13cd6bba8b1ddaf906c0c113fc27..c030f60f46bd0276103e2c0dc127036c16ebe4fc 100644 (file)
--- 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:'),