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
1 changed files with 5 additions and 3 deletions

View File

@ -827,9 +827,11 @@ class Probe {
}
}
foreach ($webfinger["aliases"] as $alias) {
if (substr($alias, 0, 5) == 'acct:') {
$data["addr"] = substr($alias, 5);
if (is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] as $alias) {
if (substr($alias, 0, 5) == 'acct:') {
$data["addr"] = substr($alias, 5);
}
}
}