OStatus: fix regressions from merge

diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 5bd899bc46ab38500c02bcb38211184bed0b2390..d9cb7a6e1be704a0ef302ebe0c4aa5f22d2b43bc 100644 (file)
--- 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 6d15f85b0d4f70f0763cf6a27d5424dddcf8601c..7563488b70a3126e0aeddba1ee68f849af0d9f10 100644 (file)
--- 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();