From: James Walker <walkah@walkah.net>
Date: Sun, 14 Mar 2010 16:57:24 +0000 (-0400)
Subject: give preference to rel="photo" (per latest ActivityStreams spec), but still support... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c4f89b06f1e7fe969e049c7dfe672bdfd6e5c8f9;p=quix0rs-gnu-social.git

give preference to rel="photo" (per latest ActivityStreams spec), but still support rel="avatar" for compat
---

diff --git a/lib/activity.php b/lib/activity.php
index 738200c0bf..6acf37a8a2 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -681,9 +681,16 @@ class ActivityObject
         if ($this->type == self::PERSON || $this->type == self::GROUP) {
             $this->displayName = $this->title;
 
-            $avatars = ActivityUtils::getLinks($element, 'avatar');
-            foreach ($avatars as $link) {
-                $this->avatarLinks[] = new AvatarLink($link);
+            $photos = ActivityUtils::getLinks($element, 'photo');
+            if (count($photos)) {
+                foreach ($photos as $link) {
+                    $this->avatarLinks[] = new AvatarLink($link);
+                }
+            } else {
+                $avatars = ActivityUtils::getLinks($element, 'avatar');
+                foreach ($avatars as $link) {
+                    $this->avatarLinks[] = new AvatarLink($link);
+                }
             }
 
             $this->poco = new PoCo($element);