Merge branch 'master' into 'nightly'

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

diff --git a/actions/apiattachment.php b/actions/apiattachment.php
index 0a0b3429907755fc96582cef267e23820fcb7b7a..505d50330e045ab5a095043c0eb6aa60d3967188 100644 (file)
--- a/actions/apiattachment.php
+++ b/actions/apiattachment.php
@@ -46,7 +46,7 @@ class ApiAttachmentAction extends ApiAuthAction
      *
      * @return boolean success flag
      */
-    protected function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);