diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2010-04-18 15:13:53 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2010-04-18 15:13:53 +0200 |
| commit | 5f4c6e9c91e46164ef33a248262e08b021b6d10f (patch) | |
| tree | 98aca9323d26694e35ed537604bb9a6b3d3c142a | |
| parent | 03d50a2e83cc631779a7574acd4db8b77f29d547 (diff) | |
| download | forums-5f4c6e9c91e46164ef33a248262e08b021b6d10f.tar forums-5f4c6e9c91e46164ef33a248262e08b021b6d10f.tar.gz forums-5f4c6e9c91e46164ef33a248262e08b021b6d10f.tar.bz2 forums-5f4c6e9c91e46164ef33a248262e08b021b6d10f.tar.xz forums-5f4c6e9c91e46164ef33a248262e08b021b6d10f.zip | |
[ticket/9548] Delete user quicktool drop down should have an empty or invalid selection as the default
PHPBB3-9548
| -rw-r--r-- | phpBB/adm/style/acp_users_overview.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 33 |
2 files changed, 21 insertions, 14 deletions
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index 7d9a0f27d3..911dcad293 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -140,7 +140,7 @@ <legend>{L_DELETE_USER}</legend> <dl> <dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt> - <dd><select id="delete_type" name="delete_type"><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd> + <dd><select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd> </dl> <p class="quick"> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 4905840e02..a9d104f0d7 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); } } |