X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FNetwork%2FProbe.php;h=4a1e1ba77820371c560388262ec672e73b2a896e;hb=960fdb90764ec3c685d940e08008dae8ea60d75c;hp=00295bc2f641a80128216351cbf4ad3759c6d2bb;hpb=999cdc7db90678c37eeb1f5874d993faa8ab748f;p=friendica.git diff --git a/src/Network/Probe.php b/src/Network/Probe.php index 00295bc2f6..4a1e1ba778 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -120,9 +120,13 @@ class Probe $numeric_fields = ['gsid', 'hide', 'account-type', 'manually-approve']; - if (!empty($data['photo']) && !Network::isValidHttpUrl($data['photo'])) { - Logger::warning('Invalid URL for photo', ['url' => $data['url'], 'photo' => $data['photo']]); - unset($data['photo']); + if (!empty($data['photo'])) { + $data['photo'] = Network::addBasePath($data['photo'], $data['url']); + + if (!Network::isValidHttpUrl($data['photo'])) { + Logger::warning('Invalid URL for photo', ['url' => $data['url'], 'photo' => $data['photo']]); + unset($data['photo']); + } } $newdata = []; @@ -1684,11 +1688,8 @@ class Probe } if ($avatar) { foreach ($avatar->attributes as $attribute) { - if ($attribute->name == 'src') { - $data['photo'] = trim($attribute->value); - if (!empty($data['photo']) && !parse_url($data['photo'], PHP_URL_SCHEME) && !parse_url($data['photo'], PHP_URL_HOST)) { - $data['photo'] = $baseurl . $data['photo']; - } + if (($attribute->name == 'src') && !empty($attribute->value)) { + $data['photo'] = Network::addBasePath($attribute->value, $baseurl); } } }