Merge branch 'twitter-check-dupe-by-uri' into 'master'

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

diff --git a/actions/apiatomservice.php b/actions/apiatomservice.php
index 5d786723e95602cb95b9ec73857735528765ffe9..9e45a30fcc2e883434254f4ddd421b2b3747b714 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
@@ -56,8 +58,7 @@ class ApiAtomServiceAction extends ApiBareAuthAction
 
         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;