summaryrefslogtreecommitdiff
path: root/plugins/OStatus
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-21 09:19:27 -0500
committerEvan Prodromou <evan@status.net>2010-02-21 09:19:27 -0500
commit9898bbdeb29c02ee1864a41bd747ac3ec7505e54 (patch)
tree5afab0e28ed677645d0727af4891960a21d27f12 /plugins/OStatus
parent7f471bde231071e3512f203ceca4b830ac2204a1 (diff)
parent5df61141d28426329d2f4e50e61c131d43d1e405 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts: plugins/OStatus/lib/activity.php
Diffstat (limited to 'plugins/OStatus')
-rw-r--r--plugins/OStatus/classes/Ostatus_profile.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 5bd899bc4..d9cb7a6e1 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -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();