From c585a43d6f55070f9e3f2ad163bda256984fda6f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 31 Aug 2011 13:09:52 -0700
Subject: [PATCH] Remove activity:actor and deprecation warning from Atom
 Activity Streams serialization

---
 lib/activity.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lib/activity.php b/lib/activity.php
index 9dbb0e2ee0..5234a54c03 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -570,18 +570,6 @@ class Activity
 
         if ($author) {
             $this->actor->outputTo($xs, 'author');
-
-            // XXX: Remove <activity:actor> ASAP! Author information
-            // has been moved to the author element in the Activity
-            // Streams spec. We're outputting actor only for backward
-            // compatibility with clients that can only parse
-            // activities based on older versions of the spec.
-
-            $depMsg = 'Deprecation warning: activity:actor is present '
-                . 'only for backward compatibility. It will be '
-                . 'removed in the next version of StatusNet.';
-            $xs->comment($depMsg);
-            $this->actor->outputTo($xs, 'activity:actor');
         }
 
         if ($this->verb != ActivityVerb::POST || count($this->objects) != 1 || $tag != 'entry') {
-- 
2.39.5