wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'support-atom-namespaces-in-rss-author' into 'master'

Browse Source 
Support more author types on RSS

Specifically, any ActivityStreams or ATOM namespaces being used on
an rss channel.

See merge request !52
This commit is contained in:
mmn 2015-11-05 15:00:07 +00:00
commit a3ddc4ec0c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/OStatus/classes/Ostatus_profile.php
View File

@ -1003,11 +1003,13 @@ class Ostatus_profile extends Managed_DataObject
} }
} }
$obj = ActivityUtils::getFeedAuthor($feedEl);
// @todo FIXME: We should check whether this feed has elements // @todo FIXME: We should check whether this feed has elements
// with different <author> or <dc:creator> elements, and... I dunno. // with different <author> or <dc:creator> elements, and... I dunno.
// Do something about that. // Do something about that.
$obj = ActivityObject::fromRssChannel($feedEl); if(empty($obj)) { $obj = ActivityObject::fromRssChannel($feedEl); }
return self::ensureActivityObjectProfile($obj, $hints); return self::ensureActivityObjectProfile($obj, $hints);
} }