Pull <atom:author> info as well as <activity:actor> when we have an old-style ActivityStreams feed. This fixes subscription setup for Cliqset feeds, which currently have a bogus activity:actor/atom:id but a good atom:author/atom:uri

This commit is contained in:
Brion Vibber
2010-03-21 16:25:12 -07:00
parent b228da628d
commit fcb614d0eb
3 changed files with 42 additions and 7 deletions

View File

@@ -1170,11 +1170,7 @@ class Ostatus_profile extends Memcached_DataObject
protected static function getActivityObjectProfileURI($object)
{
if ($object->id) {
// Possibly an upstream bug; tag: URIs are rejected unless you
// explicitly ask for them. All other schemes are accepted for
// basic URI validation without asking.
if (Validate::uri($object->id) ||
Validate::uri($object->id, array('allowed_scheme' => array('tag')))) {
if (ActivityUtils::validateUri($object->id)) {
return $object->id;
}
}