From 5df61141d28426329d2f4e50e61c131d43d1e405 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sat, 20 Feb 2010 18:25:40 -0800
Subject: [PATCH] OStatus: fix regressions from merge

---
 plugins/OStatus/classes/Ostatus_profile.php | 4 ++--
 plugins/OStatus/lib/activity.php            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 5bd899bc46..d9cb7a6e1b 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 6d15f85b0d..7563488b70 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();
 
-- 
2.39.5