From 37b15995d84e3833363bb169dcab8c467bbf26b3 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 7 Mar 2017 16:43:22 -0500 Subject: [PATCH] Add pump.io network to probing supported networks - Remove useless condition --- include/Contact.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index 5b0599449..ee5ec0cfc 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -578,8 +578,8 @@ function get_contact($url, $uid = 0, $no_update = false) { require_once('include/Probe.php'); $data = Probe::uri($url); - // Does this address belongs to a valid network? - if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) { + // Last try in gcontact for unsupported networks + if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO))) { if ($uid != 0) { return 0; } @@ -594,11 +594,6 @@ function get_contact($url, $uid = 0, $no_update = false) { $data = $gcontacts[0]; } - // Unable to convert nick@server.tld into http://server.tld/nick - if (!$data['url'] && (!strstr($url, "http") OR strstr($url, "@"))) { - return 0; - } - $url = $data["url"]; if (!$contact_id) {