eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

Browse Source 
Conflicts:
	plugins/OStatus/lib/activity.php
This commit is contained in:
Evan Prodromou 2010-02-21 09:19:27 -05:00
commit 9898bbdeb2
1 changed files with 2 additions and 2 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);
}
if ($object == null) {
$object = $this->asActivityNoun('object');
$object = $this;
}
if ($this->salmonuri) {
$text = 'update'; // @fixme
@ -345,7 +345,7 @@ class Ostatus_profile extends Memcached_DataObject
$entry->element('activity:verb', null, $verb);
$entry->raw($actor->asAtomAuthor());
$entry->raw($actor->asActivityActor());
$entry->raw($object);
$entry->raw($object->asActivityNoun('object'));
$entry->elementEnd('entry');
$xml = $entry->getString();