Merge remote-tracking branch 'upstream/develop' into 1701-index-again
This commit is contained in:
commit
d6ca6f24a7
1 changed files with 10 additions and 2 deletions
|
@ -715,13 +715,21 @@ class Probe {
|
|||
$photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */
|
||||
foreach ($photos AS $photo) {
|
||||
$attr = array();
|
||||
foreach ($photo->attributes as $attribute)
|
||||
foreach ($photo->attributes as $attribute) {
|
||||
$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"];
|
||||
}
|
||||
|
||||
// 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)) {
|
||||
ksort($avatar);
|
||||
$data["photo"] = array_pop($avatar);
|
||||
|
|
Loading…
Reference in a new issue