summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/atomnoticefeed.php16
-rw-r--r--lib/atomusernoticefeed.php11
2 files changed, 3 insertions, 24 deletions
diff --git a/lib/atomnoticefeed.php b/lib/atomnoticefeed.php
index e4df731fe..3c3556cb9 100644
--- 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 6485aaa43..2ad8de455 100644
--- 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;
- }
}