friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #14165 from annando/probe 

Fixes "Undefined array key url"
pull/14166/head
Hypolite Petovan 2024-05-16 11:15:59 -04:00 committed by GitHub
parent 570de6a91a 4ce1911889
commit 1f12d1e668
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Network/Probe.php
View File

@ -1201,7 +1201,7 @@ class Probe
if (!empty($webfinger['aliases']) && is_array($webfinger['aliases'])) {
foreach ($webfinger['aliases'] as $alias) {
if (empty($data['url']) && !strstr($alias, '@')) {
if (empty($data['url']) && Network::isValidHttpUrl($alias)) {
$data['url'] = $alias;
} elseif (Network::isValidHttpUrl($alias) && !Strings::compareLink($alias, $data['url'])) {
$data['alias'] = $alias;
@ -1455,7 +1455,7 @@ class Probe
if (!empty($webfinger['aliases']) && is_array($webfinger['aliases'])) {
foreach ($webfinger['aliases'] as $alias) {
if (strstr($alias, '@') && !strstr(Strings::normaliseLink($alias), 'http://')) {
if (strstr($alias, '@') && !Network::isValidHttpUrl($alias)) {
$data['addr'] = str_replace('acct:', '', $alias);
}
}
@ -1463,7 +1463,7 @@ class Probe
if (
!empty($webfinger['subject']) && strstr($webfinger['subject'], '@')
&& !strstr(Strings::normaliseLink($webfinger['subject']), 'http://')
&& !Network::isValidHttpUrl($webfinger['subject'])
) {
$data['addr'] = str_replace('acct:', '', $webfinger['subject']);
}