summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-20 18:25:40 -0800
committerBrion Vibber <brion@pobox.com>2010-02-20 18:25:40 -0800
commit5df61141d28426329d2f4e50e61c131d43d1e405 (patch)
treed5c138d7ced1613ae97d290e211ebbbd65387c80 /plugins
parenta3de4caf497b5d4a4d34477279fefe4c4d7ad8e2 (diff)
OStatus: fix regressions from merge
Diffstat (limited to 'plugins')
-rw-r--r--plugins/OStatus/classes/Ostatus_profile.php4
-rw-r--r--plugins/OStatus/lib/activity.php2
2 files changed, 3 insertions, 3 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();
diff --git a/plugins/OStatus/lib/activity.php b/plugins/OStatus/lib/activity.php
index 6d15f85b0..7563488b7 100644
--- a/plugins/OStatus/lib/activity.php
+++ b/plugins/OStatus/lib/activity.php
@@ -284,7 +284,7 @@ class ActivityObject
}
}
- static fromNotice($notice)
+ static function fromNotice($notice)
{
$object = new ActivityObject();