From 5cabb63e4eaf7cd3642bf7a0c4beb3fef2e1ba07 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 24 Feb 2010 17:36:31 +0000
Subject: Include <author> with actor ID and name in Activity::asString();
 fixes Salmon signature on OStatus unsub pings

---
 lib/activity.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/activity.php b/lib/activity.php
index 5cbab8d5f..fa4ae0274 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -957,11 +957,24 @@ class Activity
         }
 
         // XXX: add context
-        // XXX: add target
 
+        $xs->elementStart('author');
+        $xs->element('uri', array(), $this->actor->id);
+        if ($this->actor->title) {
+            $xs->element('name', array(), $this->actor->title);
+        }
+        $xs->elementEnd('author');
         $xs->raw($this->actor->asString('activity:actor'));
+
         $xs->element('activity:verb', null, $this->verb);
-        $xs->raw($this->object->asString());
+
+        if ($this->object) {
+            $xs->raw($this->object->asString());
+        }
+
+        if ($this->target) {
+            $xs->raw($this->target->asString('activity:target'));
+        }
 
         $xs->elementEnd('entry');
 
-- 
cgit v1.2.3-54-g00ecf