Merge remote-tracking branch 'upstream/develop' into ap-forum

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index 75728b7043e9f28f49b4af769f15da31e7266da8..cd1c66c89191bc0c05586e265cd5c9118047b13d 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -27,6 +27,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Module\Contact as ModuleContact;
 
 /**
  * Controller for /match.
@@ -87,13 +88,13 @@ function match_content(App $a)
                        $profile = $msearch->results[$i];
 
                        // Already known contact
-                       if (!$profile || Contact::getIdForURL($profile->url, local_user(), false)) {
+                       if (!$profile || Contact::getIdForURL($profile->url, local_user())) {
                                continue;
                        }
 
-                       $contact = Contact::getByURL($profile->url);
+                       $contact = Contact::getByURLForUser($profile->url, local_user());
                        if (!empty($contact)) {
-                               $entries[] = Contact::getTemplateData($contact, $i);
+                               $entries[] = ModuleContact::getContactTemplateVars($contact);
                        }
                }