aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
diff options
context:
space:
mode:
authormrgoldy <gijsmartens1@gmail.com>2019-01-15 20:50:37 +0100
committermrgoldy <gijsmartens1@gmail.com>2019-01-15 20:50:37 +0100
commit3f4b7059cb4903a314565ae448d142121e9e9611 (patch)
tree17518a4847155d4930c53c869404ec8dba2be2a2 /phpBB/includes/mcp
parent5e302c7e15a2f683755eb500d162866484a898f6 (diff)
downloadforums-3f4b7059cb4903a314565ae448d142121e9e9611.tar
forums-3f4b7059cb4903a314565ae448d142121e9e9611.tar.gz
forums-3f4b7059cb4903a314565ae448d142121e9e9611.tar.bz2
forums-3f4b7059cb4903a314565ae448d142121e9e9611.tar.xz
forums-3f4b7059cb4903a314565ae448d142121e9e9611.zip
[ticket/15942] Allow array in confirm_box title
PHPBB3-15942
Diffstat (limited to 'phpBB/includes/mcp')
-rw-r--r--phpBB/includes/mcp/mcp_main.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index a4e3a74ba7..565839b3ee 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -933,7 +933,7 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
$l_confirm = (count($topic_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS';
if ($only_softdeleted)
{
- $l_confirm .= '_PERMANENTLY';
+ $l_confirm = array($l_confirm . '_PERMANENTLY', count($topic_ids));
$s_hidden_fields['delete_permanent'] = '1';
}
else if ($only_shadow || !$auth->acl_get('m_softdelete', $forum_id))
@@ -1187,7 +1187,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '',
$l_confirm = (count($post_ids) == 1) ? 'DELETE_POST' : 'DELETE_POSTS';
if ($only_softdeleted)
{
- $l_confirm .= '_PERMANENTLY';
+ $l_confirm = array($l_confirm . '_PERMANENTLY', (int) count($post_ids));
$s_hidden_fields['delete_permanent'] = '1';
}
else if (!$auth->acl_get('m_softdelete', $forum_id))