Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 13:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove over-specific location fields from vcard in favor of "location"

Browse source
This commit is contained in:
Hypolite Petovan 2020-09-09 01:21:56 -04:00
parent fb7f7435c0
commit 6ad75f5b41
7 changed files with 27 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Model/Profile.php
View file

@ -354,13 +354,7 @@ class Profile
// Fetch the account type
$account_type = Contact::getAccountType($profile);
if (!empty($profile['address'])
|| !empty($profile['location'])
|| !empty($profile['locality'])
|| !empty($profile['region'])
|| !empty($profile['postal-code'])
|| !empty($profile['country-name'])
) {
if (!empty($profile['address']) || !empty($profile['location'])) {
$location = DI::l10n()->t('Location:');
}
@ -427,10 +421,6 @@ class Profile
$p['about'] = BBCode::convert($p['about']);
}
if (empty($p['address']) && !empty($p['location'])) {
$p['address'] = $p['location'];
}
if (isset($p['address'])) {
$p['address'] = BBCode::convert($p['address']);
}