keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use public contact ID in Model\Profile::getVCardHtml instead of potentially self-contact ID

Browse source 
- This prevented contact conversation link from working
This commit is contained in:
Hypolite Petovan 2023-11-05 08:49:12 -05:00
parent 35de254bd2
commit da9baf2be8
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Model/Profile.php
View file

@ -307,7 +307,12 @@ class Profile
$profile_url = $profile['url']; $profile_url = $profile['url'];
$cid = $profile['id']; $contact = Contact::selectFirst(['id'], ['uri-id' => $profile['uri-id'], 'uid' => 0]);
if (!$contact) {
return $o;
}
$cid = $contact['id'];
$follow_link = null; $follow_link = null;
$unfollow_link = null; $unfollow_link = null;
@ -457,12 +462,12 @@ class Profile
$mention_label = DI::l10n()->t('Post to group'); $mention_label = DI::l10n()->t('Post to group');
$mention_url = 'compose/0?body=!' . $profile['addr']; $mention_url = 'compose/0?body=!' . $profile['addr'];
$network_label = DI::l10n()->t('View group'); $network_label = DI::l10n()->t('View group');
$network_url = 'network/group/' . $profile['id']; $network_url = 'network/group/' . $cid;
} else { } else {
$mention_label = DI::l10n()->t('Mention'); $mention_label = DI::l10n()->t('Mention');
$mention_url = 'compose/0?body=@' . $profile['addr']; $mention_url = 'compose/0?body=@' . $profile['addr'];
$network_label = DI::l10n()->t('Network Posts'); $network_label = DI::l10n()->t('Network Posts');
$network_url = 'contact/' . $profile['id'] . '/conversations'; $network_url = 'contact/' . $cid . '/conversations';
} }
$tpl = Renderer::getMarkupTemplate('profile/vcard.tpl'); $tpl = Renderer::getMarkupTemplate('profile/vcard.tpl');