X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapiblockdestroy.php;h=328f18ab0dcf1765d688f807160b314ac4ba3dd2;hb=935410e8dc4c2d4d286a942cc27bbf8bc452fbdd;hp=109e66ac41380a7b3421cd67bab987ab924e0482;hpb=f746993c2bfb674d397cf095a2ab2ff7e757818b;p=quix0rs-gnu-social.git

diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php
index 109e66ac41..328f18ab0d 100644
--- a/actions/apiblockdestroy.php
+++ b/actions/apiblockdestroy.php
@@ -21,6 +21,7 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -39,6 +40,7 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -46,7 +48,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
 
 class ApiBlockDestroyAction extends ApiAuthAction
 {
-    var $user    = null;
     var $other   = null;
 
     /**
@@ -62,12 +63,6 @@ class ApiBlockDestroyAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user   = $this->auth_user;
         $this->other  = $this->getTargetUser($this->arg('id'));
 
@@ -98,16 +93,16 @@ class ApiBlockDestroyAction extends ApiAuthAction
         }
 
         if (empty($this->user) || empty($this->other)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
         if (!$this->user->hasBlocked($this->other)
             || $this->user->unblock($this->other)
         ) {
-            $this->init_document($this->format);
-            $this->show_profile($this->other, $this->format);
-            $this->end_document($this->format);
+            $this->initDocument($this->format);
+            $this->showProfile($this->other, $this->format);
+            $this->endDocument($this->format);
         } else {
             $this->serverError(_('Unblock user failed.'));
         }