Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

[quix0rs-gnu-social.git] / lib / activityutils.php

diff --git a/lib/activityutils.php b/lib/activityutils.php
index 11befc0ed4774925c2b499eb540da72cc98324c0..3aa09deb4e7761f7812a0007506726d3f26baf02 100644 (file)
--- a/lib/activityutils.php
+++ b/lib/activityutils.php
@@ -273,14 +273,6 @@ class ActivityUtils
 
     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
 
         $subject = ActivityUtils::child($feedEl, Activity::SUBJECT, Activity::SPEC);
@@ -289,6 +281,14 @@ class ActivityUtils
             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
         // entries.
 
@@ -298,14 +298,6 @@ class ActivityUtils
 
             $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
 
             $actor = ActivityUtils::child($entry, Activity::ACTOR, Activity::SPEC);
@@ -313,6 +305,14 @@ class ActivityUtils
             if (!empty($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;