fixup activity serialization so salmon notifications work

diff --git a/plugins/OStatus/lib/activity.php b/plugins/OStatus/lib/activity.php
index f25a843c366bef4177da7b42c86c49a305cd2f30..af83f8bc666a6c03cb5694ece6c6f91e9fa42f91 100644 (file)
--- a/plugins/OStatus/lib/activity.php
+++ b/plugins/OStatus/lib/activity.php
@@ -392,7 +392,7 @@ class ActivityObject
 
         if (!empty($this->content)) {
             // XXX: assuming HTML content here
-            $xs->element(self::CONTENT, array('type' => 'html'), $this->content);
+            $xs->element(ActivityUtils::CONTENT, array('type' => 'html'), $this->content);
         }
 
         if (!empty($this->link)) {
@@ -700,7 +700,7 @@ class Activity
         // XXX: add context
         // XXX: add target
 
-        $xs->raw($this->actor->asString());
+        $xs->raw($this->actor->asString('activity:actor'));
         $xs->element('activity:verb', null, $this->verb);
         $xs->raw($this->object->asString());