diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 01:41:16 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 01:41:16 +0200 |
| commit | f22f89888d7066ff8995b2eaf70ab2474d3352a2 (patch) | |
| tree | 3f9d686b78fc95ee4ee8f0c97b26cdb3aaf52d34 | |
| parent | c091a04a558708ee2ba888b18adc1b5a24c014dd (diff) | |
| parent | 0e93d8386bef21f2af5647bf13e9ba68156cf7da (diff) | |
| download | forums-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
| -rw-r--r-- | phpBB/adm/style/acp_ban.html | 6 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_ban.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index 539e8032dd..cf44f4aaa7 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -31,9 +31,9 @@ function display_details(option) { - document.getElementById('acp_unban').unbangivereason.value = ban_give_reason[option]; - document.getElementById('acp_unban').unbanreason.value = ban_reason[option]; - document.getElementById('acp_unban').unbanlength.value = ban_length[option]; + document.getElementById('acp_unban').unbangivereason.innerHTML = ban_give_reason[option]; + document.getElementById('acp_unban').unbanreason.innerHTML = ban_reason[option]; + document.getElementById('acp_unban').unbanlength.innerHTML = ban_length[option]; } // ]]> 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), )); } } |