diff options
| author |   Meik Sievertsen <acydburn@phpbb.com> | 2008-02-01 12:26:14 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-02-01 12:26:14 +0000 |
| commit | e27bed357b401f21b52bb50610d2c10a1b9b2bf6 (patch) | |
| tree | 27a5f6c54979bd9e31b751ebede01d3b67c32629 | |
| parent | More form tokens (diff) | |
| download | forums-e27bed357b401f21b52bb50610d2c10a1b9b2bf6.tar.gz forums-e27bed357b401f21b52bb50610d2c10a1b9b2bf6.tar.bz2 forums-e27bed357b401f21b52bb50610d2c10a1b9b2bf6.zip | |
#12271
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@8358 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/admin/admin_words.php | 8 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/admin/admin_words.php b/phpBB/admin/admin_words.php index 409f583df..2967fb14c 100644 --- a/phpBB/admin/admin_words.php +++ b/phpBB/admin/admin_words.php @@ -107,8 +107,8 @@ if( $mode != "" ) } $template->assign_vars(array( - "WORD" => $word_info['word'], - "REPLACEMENT" => $word_info['replacement'], + "WORD" => htmlspecialchars($word_info['word']), + "REPLACEMENT" => htmlspecialchars($word_info['replacement']), "L_WORDS_TITLE" => $lang['Words_title'], "L_WORDS_TEXT" => $lang['Words_explain'], @@ -257,8 +257,8 @@ else $template->assign_block_vars("words", array( "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, - "WORD" => $word, - "REPLACEMENT" => $replacement, + "WORD" => htmlspecialchars($word), + "REPLACEMENT" => htmlspecialchars($replacement), "U_WORD_EDIT" => append_sid("admin_words.$phpEx?mode=edit&id=$word_id"), "U_WORD_DELETE" => append_sid("admin_words.$phpEx?mode=delete&id=$word_id")) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 428d8c651..668671d4d 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -77,8 +77,8 @@ p,ul,td {font-size:10pt;} <li>[Fix] Selected field on first entry by default for font size within posting_body.tpl (Bug #7124)</li> <li>[Fix] Adjusted maxlength parameters in admin/styles_edit_body.tpl (Bug #81)</li> <li>[Fix] Fixed html output in make_forum_select if no forums present (Bug #436)</li> - <li>[Fix] Fixed spelling error(s) in lang_admin.php (Bug #7172, #6978)</li> +<li>[Fix] Correctly display censored words in admin panel (Bug #12271)</li> </ul> <a name="2021"></a><h3 class="h3">l.ii. Changes since 2.0.21</h3> |