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

- This prevented contact conversation link from working

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 373acbc17370fed78e24639fc61d20728f022278..a6386c281f5d646d9f598bed554fd6c342d389ff 100644 (file)
--- 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');