forked from GNUsocial/gnu-social
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
This commit is contained in:
@@ -442,7 +442,8 @@ class Ostatus_profile extends Memcached_DataObject
|
||||
{
|
||||
$activity = new Activity($entry, $feed);
|
||||
|
||||
switch ($activity->object->type) {
|
||||
// @todo process all activity objects
|
||||
switch ($activity->objects[0]->type) {
|
||||
case ActivityObject::ARTICLE:
|
||||
case ActivityObject::BLOGENTRY:
|
||||
case ActivityObject::NOTE:
|
||||
@@ -494,7 +495,7 @@ class Ostatus_profile extends Memcached_DataObject
|
||||
|
||||
// It's not always an ActivityObject::NOTE, but... let's just say it is.
|
||||
|
||||
$note = $activity->object;
|
||||
$note = $activity->objects[0];
|
||||
|
||||
// The id URI will be used as a unique identifier for for the notice,
|
||||
// protecting against duplicate saves. It isn't required to be a URL;
|
||||
|
Reference in New Issue
Block a user