Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/apiconversation.php b/actions/apiconversation.php
index b3b44c77219b415f1cbe1dfa53a8fa45ffad5871..728d62c24b6f7f9a2c7a3c3dfb431183627b6dc1 100644 (file)
--- a/actions/apiconversation.php
+++ b/actions/apiconversation.php
@@ -49,16 +49,9 @@ class ApiconversationAction extends ApiAuthAction
     protected $conversation = null;
     protected $notices      = null;
 
-    /**
-     * For initializing members of the class.
-     *
-     * @param array $argarray misc. arguments
-     *
-     * @return boolean true
-     */
-    function prepare($argarray)
+    protected function prepare(array $args=array())
     {
-        parent::prepare($argarray);
+        parent::prepare($args);
 
         $convId = $this->trimmed('id');
 
@@ -75,9 +68,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 +156,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') {