Email notify-on-fave moved to Profile_prefs (run upgrade.php)

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

diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php
index 13cc88c2c73bcc6c53d67ae3e6b4a78c559bf1ca..3a60b87637e571dd27a6c5653441b59afa380f57 100644 (file)
--- a/actions/apistatusesshow.php
+++ b/actions/apistatusesshow.php
@@ -38,8 +38,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiprivateauth.php';
-
 /**
  * Returns the notice specified by id as a Twitter-style status and inline user
  *
@@ -82,7 +80,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
             $this->notice_id = (int)$this->arg('id');
         }
 
-        $this->notice = Notice::staticGet((int)$this->notice_id);
+        $this->notice = Notice::getKV((int)$this->notice_id);
 
         return true;
     }
@@ -103,7 +101,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
         if (!in_array($this->format, array('xml', 'json', 'atom'))) {
             // TRANS: Client error displayed when coming across a non-supported API method.
             $this->clientError(_('API method not found.'), 404);
-            return;
         }
 
         switch ($_SERVER['REQUEST_METHOD']) {
@@ -116,7 +113,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
         default:
             // TRANS: Client error displayed calling an unsupported HTTP error in API status show.
             $this->clientError(_('HTTP method not supported.'), 405);
-            return;
         }
     }
 
@@ -147,7 +143,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
             // XXX: Twitter just sets a 404 header and doens't bother
             // to return an err msg
 
-            $deleted = Deleted_notice::staticGet($this->notice_id);
+            $deleted = Deleted_notice::getKV($this->notice_id);
 
             if (!empty($deleted)) {
                 $this->clientError(
@@ -225,7 +221,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
         if ($this->format != 'atom') {
             // TRANS: Client error displayed when trying to delete a notice not using the Atom format.
             $this->clientError(_('Can only delete using the Atom format.'));
-            return;
         }
 
         if (empty($this->auth_user) ||
@@ -233,7 +228,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
              !$this->auth_user->hasRight(Right::DELETEOTHERSNOTICE))) {
             // TRANS: Client error displayed when a user has no rights to delete notices of other users.
             $this->clientError(_('Cannot delete this notice.'), 403);
-            return;
         }
 
         if (Event::handle('StartDeleteOwnNotice', array($this->auth_user, $this->notice))) {