Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/apiatomservice.php b/actions/apiatomservice.php
index 8267c38b839e9b8db712cb8ac756759327d3f347..7673cee043332b93591b05ed23b9f7bd5dbcabe4 100644 (file)
--- a/actions/apiatomservice.php
+++ b/actions/apiatomservice.php
@@ -51,15 +51,14 @@ 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'));
 
         if (empty($this->user)) {
             // TRANS: Client error displayed when making an Atom API request for an unknown user.
-            $this->clientError(_('No such user.'), 404, $this->format);
-            return;
+            $this->clientError(_('No such user.'), 404);
         }
 
         return true;
@@ -72,9 +71,9 @@ class ApiAtomServiceAction extends ApiBareAuthAction
      *
      * @return void
      */
-    function handle($args)
+    function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         header('Content-Type: application/atomsvc+xml');