eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

check legacy <actor> and <subject> first from feed

Browse Source
This commit is contained in:
Evan Prodromou 2011-02-11 02:59:18 +00:00
parent 8fa44e58f9
commit fc317f8b72
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/activityutils.php
View File

@ -273,14 +273,6 @@ class ActivityUtils
static function getFeedAuthor($feedEl) static function getFeedAuthor($feedEl)
{ {
// Try the feed author
$author = ActivityUtils::child($feedEl, Activity::AUTHOR, Activity::ATOM);
if (!empty($author)) {
return new ActivityObject($author);
}
// Try old and deprecated activity:subject // Try old and deprecated activity:subject
$subject = ActivityUtils::child($feedEl, Activity::SUBJECT, Activity::SPEC); $subject = ActivityUtils::child($feedEl, Activity::SUBJECT, Activity::SPEC);
@ -289,6 +281,14 @@ class ActivityUtils
return new ActivityObject($subject); return new ActivityObject($subject);
} }
// Try the feed author
$author = ActivityUtils::child($feedEl, Activity::AUTHOR, Activity::ATOM);
if (!empty($author)) {
return new ActivityObject($author);
}
// Sheesh. Not a very nice feed! Let's try fingerpoken in the // Sheesh. Not a very nice feed! Let's try fingerpoken in the
// entries. // entries.
@ -298,14 +298,6 @@ class ActivityUtils
$entry = $entries->item(0); $entry = $entries->item(0);
// Try the author
$author = ActivityUtils::child($entry, Activity::AUTHOR, Activity::ATOM);
if (!empty($author)) {
return new ActivityObject($author);
}
// Try the (deprecated) activity:actor // Try the (deprecated) activity:actor
$actor = ActivityUtils::child($entry, Activity::ACTOR, Activity::SPEC); $actor = ActivityUtils::child($entry, Activity::ACTOR, Activity::SPEC);
@ -313,6 +305,14 @@ class ActivityUtils
if (!empty($actor)) { if (!empty($actor)) {
return new ActivityObject($actor); return new ActivityObject($actor);
} }
// Try the author
$author = ActivityUtils::child($entry, Activity::AUTHOR, Activity::ATOM);
if (!empty($author)) {
return new ActivityObject($author);
}
} }
return null; return null;