Merge remote-tracking branch 'upstream/develop' into issue-3571-2

This commit is contained in:
Michael 2017-07-12 05:41:58 +00:00
commit a8db1282e2

View file

@ -827,11 +827,13 @@ class Probe {
}
}
if (is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] as $alias) {
if (substr($alias, 0, 5) == 'acct:') {
$data["addr"] = substr($alias, 5);
}
}
}
if (!isset($data["network"]) || ($hcard_url == "")) {
return false;