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

Fix behavior regression 

Reverted quitting get_contact if Probe::uri didn’t yield an url for
“nick@server.tld” form.
This commit is contained in:
Hypolite Petovan 2017-03-07 16:28:15 -05:00
parent 97378893cd
commit d7f62e82b9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/Contact.php
View File

@ -577,11 +577,6 @@ function get_contact($url, $uid = 0, $no_update = false) {
require_once('include/Probe.php');
$data = Probe::uri($url);
if (!$data['url']) {
return 0;
}
$url = $data["url"];
// Does this address belongs to a valid network?
if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) {
@ -599,6 +594,12 @@ 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) {
q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,