friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Add pump.io network to probing supported networks 

- Remove useless condition
This commit is contained in:
Hypolite Petovan 2017-03-07 16:43:22 -05:00
parent d7f62e82b9
commit 37b15995d8
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/Contact.php
View File

@ -578,8 +578,8 @@ function get_contact($url, $uid = 0, $no_update = false) {
require_once('include/Probe.php'); require_once('include/Probe.php');
$data = Probe::uri($url); $data = Probe::uri($url);
// Does this address belongs to a valid network? // Last try in gcontact for unsupported networks
if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) { if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO))) {
if ($uid != 0) { if ($uid != 0) {
return 0; return 0;
} }
@ -594,11 +594,6 @@ function get_contact($url, $uid = 0, $no_update = false) {
$data = $gcontacts[0]; $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"]; $url = $data["url"];
if (!$contact_id) { if (!$contact_id) {