aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-07-08 01:41:16 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-07-08 01:41:16 +0200
commitf22f89888d7066ff8995b2eaf70ab2474d3352a2 (patch)
tree3f9d686b78fc95ee4ee8f0c97b26cdb3aaf52d34 /phpBB/includes
parentc091a04a558708ee2ba888b18adc1b5a24c014dd (diff)
parent0e93d8386bef21f2af5647bf13e9ba68156cf7da (diff)
downloadforums-f22f89888d7066ff8995b2eaf70ab2474d3352a2.tar
forums-f22f89888d7066ff8995b2eaf70ab2474d3352a2.tar.gz
forums-f22f89888d7066ff8995b2eaf70ab2474d3352a2.tar.bz2
forums-f22f89888d7066ff8995b2eaf70ab2474d3352a2.tar.xz
forums-f22f89888d7066ff8995b2eaf70ab2474d3352a2.zip
Merge branch 'ticket/jellydoughnut/9695' into develop-olympus
* ticket/jellydoughnut/9695: [ticket/9695] Correct the improper display of user input in mcp_ban.php
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_ban.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php
index 3198376584..a7ea57b753 100644
--- a/phpBB/includes/acp/acp_ban.php
+++ b/phpBB/includes/acp/acp_ban.php
@@ -224,7 +224,7 @@ class acp_ban
$template->assign_block_vars('ban_reason', array(
'BAN_ID' => $ban_id,
'REASON' => $reason,
- 'A_REASON' => addslashes(htmlspecialchars_decode($reason)),
+ 'A_REASON' => addslashes($reason),
));
}
}
@@ -236,7 +236,7 @@ class acp_ban
$template->assign_block_vars('ban_give_reason', array(
'BAN_ID' => $ban_id,
'REASON' => $reason,
- 'A_REASON' => addslashes(htmlspecialchars_decode($reason)),
+ 'A_REASON' => addslashes($reason),
));
}
}