bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #3094 from annando/1701-hubzilla-probe

Browse source 
Fixing avatar problems when probing Hubzilla contacts
This commit is contained in:
Tobias Diekershoff 2017-01-16 07:27:03 +01:00 committed by GitHub
parent b067a11146 e63e241f8f
commit e7966171dd
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/Probe.php
View file

@ -715,13 +715,21 @@ class Probe {
$photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */ $photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */
foreach ($photos AS $photo) { foreach ($photos AS $photo) {
$attr = array(); $attr = array();
foreach ($photo->attributes as $attribute) foreach ($photo->attributes as $attribute) {
$attr[$attribute->name] = trim($attribute->value); $attr[$attribute->name] = trim($attribute->value);
}
if (isset($attr["src"]) AND isset($attr["width"])) if (isset($attr["src"]) AND isset($attr["width"])) {
$avatar[$attr["width"]] = $attr["src"]; $avatar[$attr["width"]] = $attr["src"];
} }
// We don't have a width. So we just take everything that we got.
// This is a Hubzilla workaround which doesn't send a width.
if ((sizeof($avatar) == 0) AND isset($attr["src"])) {
$avatar[] = $attr["src"];
}
}
if (sizeof($avatar)) { if (sizeof($avatar)) {
ksort($avatar); ksort($avatar);
$data["photo"] = array_pop($avatar); $data["photo"] = array_pop($avatar);