Merge branch 'master' of gitorious.org:social/mainline

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

diff --git a/actions/apiconversation.php b/actions/apiconversation.php
index b3b44c77219b415f1cbe1dfa53a8fa45ffad5871..7de7b668379bbb2cd7a505162f73a888b33bc2d9 100644 (file)
--- a/actions/apiconversation.php
+++ b/actions/apiconversation.php
@@ -75,9 +75,7 @@ class ApiconversationAction extends ApiAuthAction
                                       404);
         }
 
-        $profile = Profile::current();
-
-        $stream = new ConversationNoticeStream($convId, $profile);
+        $stream = new ConversationNoticeStream($convId, $this->scoped);
 
         $notice = $stream->getNotices(($this->page-1) * $this->count,
                                       $this->count,
@@ -165,7 +163,7 @@ class ApiconversationAction extends ApiAuthAction
      *
      * @return boolean is read only action?
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
             $_SERVER['REQUEST_METHOD'] == 'HEAD') {