mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[feature/soft-delete] Invert the logic on confirm box

Browse Source 
Permanent delete is now the checkbox rather then softdelete.

PHPBB3-9567
This commit is contained in:
Joas Schilling
2012-11-01 22:23:35 +01:00
parent 8d05dad634
commit bed82bf2bd
6 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/includes/mcp/mcp_main.php
View File

@@ -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");