From 8f90b794570e520eec82fc8c1f87ae5c93696873 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Mon, 24 Dec 2018 09:45:02 +0100 Subject: [PATCH 1/2] [ticket/15918] Remove redundant escape JS In mcp_ban.html and coherently use twig syntax PHPBB3-15918 --- phpBB/styles/prosilver/template/mcp_ban.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/styles/prosilver/template/mcp_ban.html b/phpBB/styles/prosilver/template/mcp_ban.html index d953f1039f..f3b767f3e4 100644 --- a/phpBB/styles/prosilver/template/mcp_ban.html +++ b/phpBB/styles/prosilver/template/mcp_ban.html @@ -9,12 +9,12 @@ ban_give_reason[-1] = ''; - ban_length['{bans.BAN_ID}'] = '{bans.A_LENGTH}'; + ban_length['{bans.BAN_ID}'] = '{{ bans.A_LENGTH }}'; - ban_reason['{bans.BAN_ID}'] = '{{ bans.A_REASON | e('js') }}'; + ban_reason['{bans.BAN_ID}'] = '{{ bans.A_REASON }}'; - ban_give_reason['{bans.BAN_ID}'] = '{{ bans.A_GIVE_REASON | e('js') }}'; + ban_give_reason['{bans.BAN_ID}'] = '{{ bans.A_GIVE_REASON }}'; From 440fdfdffcc36d1483d3a86f3fc7a152fb9d7a63 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Mon, 24 Dec 2018 11:56:30 +0100 Subject: [PATCH 2/2] [ticket/15918] Apply the Twig escape filter to not add-slashed contents PHPBB3-15918 --- phpBB/styles/prosilver/template/mcp_ban.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/mcp_ban.html b/phpBB/styles/prosilver/template/mcp_ban.html index f3b767f3e4..86a322435d 100644 --- a/phpBB/styles/prosilver/template/mcp_ban.html +++ b/phpBB/styles/prosilver/template/mcp_ban.html @@ -11,10 +11,10 @@ ban_length['{bans.BAN_ID}'] = '{{ bans.A_LENGTH }}'; - ban_reason['{bans.BAN_ID}'] = '{{ bans.A_REASON }}'; + ban_reason['{bans.BAN_ID}'] = '{{ bans.REASON | e('js') }}'; - ban_give_reason['{bans.BAN_ID}'] = '{{ bans.A_GIVE_REASON }}'; + ban_give_reason['{bans.BAN_ID}'] = '{{ bans.GIVE_REASON | e('js') }}';