From ff2553b9c72d0470bfa18f1100bcd0e17b4f7e90 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Feb 2011 03:01:24 +0000 Subject: [PATCH] get the subject first if you go to the feed --- lib/activity.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/activity.php b/lib/activity.php index 6c21c0bcc9..17684d897b 100644 --- a/lib/activity.php +++ b/lib/activity.php @@ -205,18 +205,19 @@ class Activity // the surrounding feed. $this->actor = new ActivityObject($authorEl); - } else if (!empty($feed) && $authorEl = $this->_child($feed, self::AUTHOR, - self::ATOM)) { - - // If there's no on the entry, it's safe to assume - // the containing feed's authorship info applies. - $this->actor = new ActivityObject($authorEl); } else if (!empty($feed) && $subjectEl = $this->_child($feed, self::SUBJECT)) { // Feed subject is used for things like groups. // Should actually possibly not be interpreted as an actor...? $this->actor = new ActivityObject($subjectEl); + + } else if (!empty($feed) && $authorEl = $this->_child($feed, self::AUTHOR, + self::ATOM)) { + + // If there's no on the entry, it's safe to assume + // the containing feed's authorship info applies. + $this->actor = new ActivityObject($authorEl); } $contextEl = $this->_child($entry, self::CONTEXT); -- 2.39.5