Merge pull request #10627 from annando/like-announce

[friendica.git] / src / Module / Contact.php

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 9685d090e7a0ef1ef7a5fc0d6d49d4b61eaa1148..ae7c77d9927b0b23dc6a692529592dbacc3db774 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -168,7 +168,7 @@ class Contact extends BaseModule
                }
 
                if ($contact['network'] == Protocol::OSTATUS) {
-                       $result = Model\Contact::createFromProbe($contact['uid'], $contact['url'], $contact['network']);
+                       $result = Model\Contact::createFromProbeForUser($contact['uid'], $contact['url'], $contact['network']);
 
                        if ($result['success']) {
                                DBA::update('contact', ['subhub' => 1], ['id' => $contact_id]);
@@ -607,6 +607,8 @@ class Contact extends BaseModule
                                '$location_label' => DI::l10n()->t('Location:'),
                                '$xmpp'           => BBCode::convertForUriId($contact['uri-id'] ?? 0, $contact['xmpp']),
                                '$xmpp_label'     => DI::l10n()->t('XMPP:'),
+                               '$matrix'         => BBCode::convertForUriId($contact['uri-id'] ?? 0, $contact['matrix']),
+                               '$matrix_label'   => DI::l10n()->t('Matrix:'),
                                '$about'          => BBCode::convertForUriId($contact['uri-id'] ?? 0, $contact['about'], BBCode::EXTERNAL),
                                '$about_label'    => DI::l10n()->t('About:'),
                                '$keywords'       => $contact['keywords'],