Activity plugin fix (LeaveListItem unused)

[quix0rs-gnu-social.git] / lib / mailbox.php

diff --git a/lib/mailbox.php b/lib/mailbox.php
index 7c6567c6c1c0511997eb84c8ddf5d3f848b582ad..3c7281e9852121d2b948b39eac803d092058e313 100644 (file)
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -42,7 +42,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @see      InboxAction
  * @see      OutboxAction
  */
-class MailboxAction extends CurrentUserDesignAction
+class MailboxAction extends Action
 {
     var $page = null;
 
@@ -51,7 +51,7 @@ class MailboxAction extends CurrentUserDesignAction
         parent::prepare($args);
 
         $nickname   = common_canonical_nickname($this->arg('nickname'));
-        $this->user = User::staticGet('nickname', $nickname);
+        $this->user = User::getKV('nickname', $nickname);
         $this->page = $this->trimmed('page');
 
         if (!$this->page) {
@@ -77,16 +77,13 @@ class MailboxAction extends CurrentUserDesignAction
         if (!$this->user) {
             // TRANS: Client error displayed when trying to access a mailbox without providing a user.
             $this->clientError(_('No such user.'), 404);
-            return;
         }
 
         $cur = common_current_user();
 
         if (!$cur || $cur->id != $this->user->id) {
             // TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
-            $this->clientError(_('Only the user can read their own mailboxes.'),
-                403);
-            return;
+            $this->clientError(_('Only the user can read their own mailboxes.'), 403);
         }
 
         $this->showPage();