Merge branch 'group-members-pending' into 'nightly'

[quix0rs-gnu-social.git] / actions / conversation.php

diff --git a/actions/conversation.php b/actions/conversation.php
index 3b6f48c853f59a976d22e7340616f11e67e87162..b1cb50abacdde4b179e5b0c9f6b5c5a35e1a9a07 100644 (file)
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -97,7 +97,7 @@ class ConversationAction extends ManagedAction
         Event::handle('EndShowConversation', array($this, $this->conv, $this->scoped));
     }
 
-    function isReadOnly()
+    function isReadOnly($args)
     {
         return true;
     }
@@ -128,7 +128,7 @@ class ConversationAction extends ManagedAction
                                                     'format' => 'atom')),
                               // TRANS: Title for link to notice feed.
                               // TRANS: %s is a user nickname.
-                              _('Conversation feed (Activity Streams JSON)')));
+                              _('Conversation feed (Atom)')));
     }
 }