bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #6330 from annando/issue-6329

Browse source 
Issue-6329: Prevent double encoding
This commit is contained in:
Hypolite Petovan 2018-12-26 09:55:52 -05:00 committed by GitHub
commit 5620184c54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Model/Profile.php
View file

@ -512,10 +512,8 @@ class Profile
$p['about'] = BBCode::convert($p['about']); $p['about'] = BBCode::convert($p['about']);
} }
if (isset($p['address'])) { if (empty($p['address']) && !empty($p['location'])) {
$p['address'] = BBCode::convert($p['address']); $p['address'] = $p['location'];
} elseif (isset($p['location'])) {
$p['address'] = BBCode::convert($p['location']);
} }
if (isset($p['photo'])) { if (isset($p['photo'])) {

2
src/Module/Contact.php
View file

@ -643,7 +643,7 @@ class Contact extends BaseModule
'$profileurllabel'=> L10n::t('Profile URL'), '$profileurllabel'=> L10n::t('Profile URL'),
'$profileurl' => $contact['url'], '$profileurl' => $contact['url'],
'$account_type' => Model\Contact::getAccountType($contact), '$account_type' => Model\Contact::getAccountType($contact),
'$location' => BBCode::convert($contact['location']), '$location' => $contact['location'],
'$location_label' => L10n::t('Location:'), '$location_label' => L10n::t('Location:'),
'$xmpp' => BBCode::convert($contact['xmpp']), '$xmpp' => BBCode::convert($contact['xmpp']),
'$xmpp_label' => L10n::t('XMPP:'), '$xmpp_label' => L10n::t('XMPP:'),