diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-05-16 18:42:46 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-05-16 18:42:46 +0200 |
| commit | 8ade14a0363e9cae6a2433aefae56af803d3958b (patch) | |
| tree | e6dfeb0af1ea9828c890671940c8a03cb4d1f62d /phpBB/includes/acp | |
| parent | 273d926b08a93f2f8856169443961b6d683d6955 (diff) | |
| parent | 5f4c6e9c91e46164ef33a248262e08b021b6d10f (diff) | |
| download | forums-8ade14a0363e9cae6a2433aefae56af803d3958b.tar forums-8ade14a0363e9cae6a2433aefae56af803d3958b.tar.gz forums-8ade14a0363e9cae6a2433aefae56af803d3958b.tar.bz2 forums-8ade14a0363e9cae6a2433aefae56af803d3958b.tar.xz forums-8ade14a0363e9cae6a2433aefae56af803d3958b.zip | |
Merge branch 'ticket/nickvergessen/9548' into develop-olympus
* ticket/nickvergessen/9548:
[ticket/9548] Delete user quicktool drop down should have an empty or invalid selection as the default
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index bd64f1e89e..7914edd056 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -191,24 +191,31 @@ class acp_users trigger_error($user->lang['CANNOT_REMOVE_YOURSELF'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); } - if (confirm_box(true)) + if ($delete_type) { - user_delete($delete_type, $user_id, $user_row['username']); + if (confirm_box(true)) + { + user_delete($delete_type, $user_id, $user_row['username']); - add_log('admin', 'LOG_USER_DELETED', $user_row['username']); - trigger_error($user->lang['USER_DELETED'] . adm_back_link($this->u_action)); + add_log('admin', 'LOG_USER_DELETED', $user_row['username']); + trigger_error($user->lang['USER_DELETED'] . adm_back_link($this->u_action)); + } + else + { + confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( + 'u' => $user_id, + 'i' => $id, + 'mode' => $mode, + 'action' => $action, + 'update' => true, + 'delete' => 1, + 'delete_type' => $delete_type)) + ); + } } else { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'u' => $user_id, - 'i' => $id, - 'mode' => $mode, - 'action' => $action, - 'update' => true, - 'delete' => 1, - 'delete_type' => $delete_type)) - ); + trigger_error($user->lang['NO_MODE'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); } } |