From 8947473c71bc72b46c23fdd180265d6ecbaa6225 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 2 Sep 2019 05:33:13 +0000
Subject: [PATCH] Contact details are now available when searching for a single
contact
---
src/Core/Search.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/Core/Search.php b/src/Core/Search.php
index 9f8375da12..90298971a6 100644
--- a/src/Core/Search.php
+++ b/src/Core/Search.php
@@ -44,15 +44,19 @@ class Search extends BaseObject
if ((filter_var($user, FILTER_VALIDATE_EMAIL) && Network::isEmailDomainValid($user)) ||
(substr(Strings::normaliseLink($user), 0, 7) == "http://")) {
+ /// @todo Possibly use "getIdForURL" instead?
$user_data = Probe::uri($user);
if (empty($user_data)) {
return $emptyResultList;
}
- if (!(in_array($user_data["network"], Protocol::FEDERATED))) {
+ if (!in_array($user_data["network"], Protocol::FEDERATED)) {
return $emptyResultList;
}
+ // Ensure that we do have a contact entry
+ Contact::getIdForURL(defaults($user_data, 'url', ''));
+
$contactDetails = Contact::getDetailsByURL(defaults($user_data, 'url', ''), local_user());
$itemUrl = defaults($contactDetails, 'addr', defaults($user_data, 'url', ''));
@@ -63,7 +67,7 @@ class Search extends BaseObject
defaults($user_data, 'url', ''),
defaults($user_data, 'photo', ''),
defaults($user_data, 'network', ''),
- defaults($contactDetails, 'cid', 0),
+ defaults($contactDetails, 'id', 0),
0,
defaults($user_data, 'tags', '')
);