From e2578cfad68c45ca177c51997c4cc7c0abafbd9a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 2 Mar 2010 03:40:43 -0500
Subject: Revert "Show <activity:subject> and no activity actors for user feed"

This reverts commit c25fc8a4b51466f13c41efc0565bf15f78f6cb4d.
---
 classes/Notice.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'classes/Notice.php')

diff --git a/classes/Notice.php b/classes/Notice.php
index c31d8bd69..7c424ee8a 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1090,7 +1090,7 @@ class Notice extends Memcached_DataObject
         return $groups;
     }
 
-    function asAtomEntry($namespace=false, $source=false, $author=true)
+    function asAtomEntry($namespace=false, $source=false)
     {
         $profile = $this->getProfile();
 
@@ -1135,10 +1135,8 @@ class Notice extends Memcached_DataObject
 
         $xs->element('title', null, $this->content);
 
-        if ($author) {
-            $xs->raw($profile->asAtomAuthor());
-            $xs->raw($profile->asActivityActor());
-        }
+        $xs->raw($profile->asAtomAuthor());
+        $xs->raw($profile->asActivityActor());
 
         $xs->element('link', array('rel' => 'alternate',
                                    'type' => 'text/html',
-- 
cgit v1.2.3-54-g00ecf