diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-11-01 22:23:35 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-11-01 22:23:35 +0100 |
| commit | bed82bf2bd13ca04cc1572d454eee5ef3a9053a6 (patch) | |
| tree | 1c280b81838bb1e1b4d16c94d55fa7f769507501 /phpBB/includes/mcp/mcp_main.php | |
| parent | 8d05dad63471ffbc58feecd1f44cfa5703f0d5f1 (diff) | |
| download | forums-bed82bf2bd13ca04cc1572d454eee5ef3a9053a6.tar forums-bed82bf2bd13ca04cc1572d454eee5ef3a9053a6.tar.gz forums-bed82bf2bd13ca04cc1572d454eee5ef3a9053a6.tar.bz2 forums-bed82bf2bd13ca04cc1572d454eee5ef3a9053a6.tar.xz forums-bed82bf2bd13ca04cc1572d454eee5ef3a9053a6.zip | |
[feature/soft-delete] Invert the logic on confirm box
Permanent delete is now the checkbox rather then softdelete.
PHPBB3-9567
Diffstat (limited to 'phpBB/includes/mcp/mcp_main.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index c7e2252729..72c1be95b2 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -806,7 +806,10 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = '' 'S_DELETE_REASON' => $auth->acl_get('m_softdelete', $forum_id), )); - confirm_box(false, (sizeof($topic_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS', $s_hidden_fields, 'posting_delete_post_body.html'); + $l_confirm = (sizeof($post_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS'; + $l_confirm .= ($only_softdeleted) ? '_PERMANENTLY' : ''; + + confirm_box(false, $l_confirm, $s_hidden_fields, 'confirm_delete_body.html'); } $topic_id = request_var('t', 0); @@ -1031,7 +1034,10 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '') 'S_DELETE_REASON' => $auth->acl_get('m_softdelete', $forum_id), )); - confirm_box(false, (sizeof($post_ids) == 1) ? 'DELETE_POST' : 'DELETE_POSTS', $s_hidden_fields, 'posting_delete_post_body.html'); + $l_confirm = (sizeof($post_ids) == 1) ? 'DELETE_POST' : 'DELETE_POSTS'; + $l_confirm .= ($only_softdeleted) ? '_PERMANENTLY' : ''; + + confirm_box(false, $l_confirm, $s_hidden_fields, 'confirm_delete_body.html'); } $redirect = request_var('redirect', "index.$phpEx"); |