Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/apiatomservice.php b/actions/apiatomservice.php
index 87a39b56a38e5cfee871484b2b0d7ba1d564b9ee..7673cee043332b93591b05ed23b9f7bd5dbcabe4 100644 (file)
--- a/actions/apiatomservice.php
+++ b/actions/apiatomservice.php
@@ -51,7 +51,7 @@ class ApiAtomServiceAction extends ApiBareAuthAction
      * @return boolean success flag
      *
      */
-    function prepare($args)
+    function prepare(array $args = array())
     {
         parent::prepare($args);
         $this->user = $this->getTargetUser($this->arg('id'));