Merge commit 'origin/testing' into 0.9.x

Conflicts:
	lib/action.php
	lib/adminpanelaction.php

1 files changed, 13 insertions, 3 deletions

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