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

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

diff --git a/actions/apiatomservice.php b/actions/apiatomservice.php
index 5d786723e95602cb95b9ec73857735528765ffe9..6ee3eba5957766b01a78ef2986bfa50ab6265b68 100644 (file)
--- a/actions/apiatomservice.php
+++ b/actions/apiatomservice.php
@@ -27,7 +27,9 @@
  * @link      http://status.net/
  */
 
-require_once INSTALLDIR.'/lib/apibareauth.php';
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 /**
  * Shows an AtomPub service document for a user
@@ -49,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;
@@ -70,7 +71,7 @@ class ApiAtomServiceAction extends ApiBareAuthAction
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);