diff options
Diffstat (limited to 'actions/admin/user/delete.php')
| -rw-r--r-- | actions/admin/user/delete.php | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/actions/admin/user/delete.php b/actions/admin/user/delete.php index 375f8b809..7cfbd0925 100644 --- a/actions/admin/user/delete.php +++ b/actions/admin/user/delete.php @@ -9,20 +9,21 @@ * @subpackage Administration.User */ -// block non-admin users - require since this action is not registered -// @todo why isn't this action registered? -admin_gatekeeper(); - // Get the user $guid = get_input('guid'); -$obj = get_entity($guid); +$user = get_entity($guid); + +if ($guid == elgg_get_logged_in_user_guid()) { + register_error(elgg_echo('admin:user:self:delete:no')); + forward(REFERER); +} -$name = $obj->name; -$username = $obj->username; +$name = $user->name; +$username = $user->username; -if (($obj instanceof ElggUser) && ($obj->canEdit())) { - if ($obj->delete()) { - system_message(sprintf(elgg_echo('admin:user:delete:yes'), $name)); +if (($user instanceof ElggUser) && ($user->canEdit())) { + if ($user->delete()) { + system_message(elgg_echo('admin:user:delete:yes', array($name))); } else { register_error(elgg_echo('admin:user:delete:no')); } @@ -33,7 +34,7 @@ if (($obj instanceof ElggUser) && ($obj->canEdit())) { // forward to user administration if on a user's page as it no longer exists $forward = REFERER; if (strpos($_SERVER['HTTP_REFERER'], $username) != FALSE) { - $forward = "pg/admin/user/"; + $forward = "admin/users/newest"; } forward($forward); |