Don't send multiple error responses in ApiMediaUpload :)

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

diff --git a/actions/deleteuser.php b/actions/deleteuser.php
index ac96b7b5d5498f28d80d09a3d0d3189287c1d374..6b74575ab435e0d149b53ef788ca4fafde95c4d5 100644 (file)
--- a/actions/deleteuser.php
+++ b/actions/deleteuser.php
@@ -64,15 +64,13 @@ class DeleteuserAction extends ProfileFormAction
         if (!$cur->hasRight(Right::DELETEUSER)) {
             // TRANS: Client error displayed when trying to delete a user without having the right to delete users.
             $this->clientError(_('You cannot delete users.'));
-            return false;
         }
 
-        $this->user = User::staticGet('id', $this->profile->id);
+        $this->user = User::getKV('id', $this->profile->id);
 
         if (empty($this->user)) {
             // TRANS: Client error displayed when trying to delete a non-local user.
             $this->clientError(_('You can only delete local users.'));
-            return false;
         }
 
         return true;
@@ -103,6 +101,8 @@ class DeleteuserAction extends ProfileFormAction
 
     function showContent() {
         $this->areYouSureForm();
+        $block = new AccountProfileBlock($this, $this->profile);
+        $block->show();        
     }
 
     function title() {
@@ -155,14 +155,14 @@ class DeleteuserAction extends ProfileFormAction
                       'submit form_action-primary',
                       'no',
                       // TRANS: Submit button title for 'No' when deleting a user.
-                      _('Do not delete this user'));
+                      _('Do not delete this user.'));
         $this->submit('form_action-yes',
                       // TRANS: Button label on the delete user form.
                       _m('BUTTON','Yes'),
                       'submit form_action-secondary',
                       'yes',
                       // TRANS: Submit button title for 'Yes' when deleting a user.
-                      _('Delete this user'));
+                      _('Delete this user.'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }