]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Parse remote users' fullnames from PoCo::displayName elements
authorJoshua Judson Rosen <rozzin@geekspace.com>
Tue, 9 Dec 2014 02:55:51 +0000 (21:55 -0500)
committerJoshua Judson Rosen <rozzin@geekspace.com>
Tue, 9 Dec 2014 02:55:51 +0000 (21:55 -0500)
Try this first; use activity:subject->atom:title only as a fallback.

The code that output activity:subject was removed 2013-10-08,
and it it was deprecated for years before that....

lib/activityobject.php

index 7fe5c4850ca723105e4bfb82efb56d03450699f7..9a6218de3af9e954a97d7cd92a0e509c2f88fd24 100644 (file)
@@ -195,15 +195,22 @@ class ActivityObject
             $this->type = self::PERSON; // XXX: is this fair?
         }
 
-        // start with <atom:title>
 
-        $title = ActivityUtils::childHtmlContent($element, self::TITLE);
+        // Start with <poco::displayName>
 
-        if (!empty($title)) {
-            $this->title = common_strip_html($title);
+        $this->title = ActivityUtils::childContent($element, PoCo::DISPLAYNAME, PoCo::NS);
+
+        // try falling back to <atom:title>
+
+        if (empty($this->title)) {
+            $title = ActivityUtils::childHtmlContent($element, self::TITLE);
+
+            if (!empty($title)) {
+                $this->title = common_strip_html($title);
+            }
         }
 
-        // fall back to <atom:name>
+        // fall back to <atom:name> as a last resort
 
         if (empty($this->title)) {
             $this->title = $this->_childContent($element, self::NAME);