diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 373acbc17..a6386c281 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -307,7 +307,12 @@ class Profile $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; $unfollow_link = null; @@ -457,12 +462,12 @@ class Profile $mention_label = DI::l10n()->t('Post to group'); $mention_url = 'compose/0?body=!' . $profile['addr']; $network_label = DI::l10n()->t('View group'); - $network_url = 'network/group/' . $profile['id']; + $network_url = 'network/group/' . $cid; } else { $mention_label = DI::l10n()->t('Mention'); $mention_url = 'compose/0?body=@' . $profile['addr']; $network_label = DI::l10n()->t('Network Posts'); - $network_url = 'contact/' . $profile['id'] . '/conversations'; + $network_url = 'contact/' . $cid . '/conversations'; } $tpl = Renderer::getMarkupTemplate('profile/vcard.tpl'); diff --git a/view/theme/frio/templates/profile/vcard.tpl b/view/theme/frio/templates/profile/vcard.tpl index 86d6bd917..b41b206ee 100644 --- a/view/theme/frio/templates/profile/vcard.tpl +++ b/view/theme/frio/templates/profile/vcard.tpl @@ -70,19 +70,21 @@ {{/if}} - {{if $profile.addr}} - + {{if $profile.addr}} + {{/if}} - {{if $network_label}} -
-
+ {{if $network_label}} +
+ + + {{$network_label}} + +
{{/if}} {{/if}} diff --git a/view/theme/frio/templates/widget/vcard.tpl b/view/theme/frio/templates/widget/vcard.tpl index 9f030a8ef..fff5a4b0e 100644 --- a/view/theme/frio/templates/widget/vcard.tpl +++ b/view/theme/frio/templates/widget/vcard.tpl @@ -66,10 +66,10 @@ {{/if}} {{if $showgroup_link}}
- +
{{/if}}