GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Parse remote users' fullnames from PoCo::displayName elements 

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....
This commit is contained in:
Joshua Judson Rosen 2014-12-08 21:55:51 -05:00
parent d02f3c4648
commit 238095a719
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/activityobject.php
View 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);