Merge remote-tracking branch 'upstream/master'

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

diff --git a/actions/apiconversation.php b/actions/apiconversation.php
index 7de7b668379bbb2cd7a505162f73a888b33bc2d9..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');