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

OStatus: fix regressions from merge

This commit is contained in:
Brion Vibber 2010-02-20 18:25:40 -08:00
parent a3de4caf49
commit 5df61141d2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,7 +319,7 @@ class Ostatus_profile extends Memcached_DataObject
throw new ServerException("Invalid actor passed to " . __METHOD__ . ": " . $type); throw new ServerException("Invalid actor passed to " . __METHOD__ . ": " . $type);
} }
if ($object == null) { if ($object == null) {
$object = $this->asActivityNoun('object'); $object = $this;
} }
if ($this->salmonuri) { if ($this->salmonuri) {
$text = 'update'; // @fixme $text = 'update'; // @fixme
@ -345,7 +345,7 @@ class Ostatus_profile extends Memcached_DataObject
$entry->element('activity:verb', null, $verb); $entry->element('activity:verb', null, $verb);
$entry->raw($actor->asAtomAuthor()); $entry->raw($actor->asAtomAuthor());
$entry->raw($actor->asActivityActor()); $entry->raw($actor->asActivityActor());
$entry->raw($object); $entry->raw($object->asActivityNoun('object'));
$entry->elementEnd('entry'); $entry->elementEnd('entry');
$xml = $entry->getString(); $xml = $entry->getString();

2
plugins/OStatus/lib/activity.php
View File

@ -284,7 +284,7 @@ class ActivityObject
} }
} }
static fromNotice($notice) static function fromNotice($notice)
{ {
$object = new ActivityObject(); $object = new ActivityObject();