Revert "Show <activity:subject> and no activity actors for user feed"

This reverts commit c25fc8a4b51466f13c41efc0565bf15f78f6cb4d.

diff --git a/classes/Notice.php b/classes/Notice.php
index c31d8bd69ef4b5453d487c2810d36d1b5bd13a1b..7c424ee8a6f35a3230655e05cad6cac93f11bb5a 100644 (file)
--- 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',

diff --git a/lib/atomnoticefeed.php b/lib/atomnoticefeed.php
index e4df731fe02a5c3bdb7657f6d504177395345ae1..3c3556cb95c789c59c951440cf73c6b12ad64801 100644 (file)
--- a/lib/atomnoticefeed.php
+++ b/lib/atomnoticefeed.php
@@ -107,19 +107,9 @@ class AtomNoticeFeed extends Atom10Feed
      */
     function addEntryFromNotice($notice)
     {
-        $source = $this->showSource();
-        $author = $this->showAuthor();
-
-        $this->addEntryRaw($notice->asAtomEntry(false, $source, $author));
-    }
-
-    function showSource()
-    {
-        return true;
+        $this->addEntryRaw($notice->asAtomEntry());
     }
 
-    function showAuthor()
-    {
-        return true;
-    }
 }
+
+

diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index 6485aaa43dc3bb94992f6c477660a63cb34c30dc..2ad8de4550d1a3c3aac8b694f974a4ebf9e19c2d 100644 (file)
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -61,7 +61,6 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
         if (!empty($user)) {
             $profile = $user->getProfile();
             $this->addAuthor($profile->nickname, $user->uri);
-            $this->setActivitySubject($profile->asActivityNoun('subject'));
         }
     }
 
@@ -69,14 +68,4 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
     {
         return $this->user;
     }
-
-    function showSource()
-    {
-        return false;
-    }
-
-    function showAuthor()
-    {
-        return false;
-    }
 }