diff options
| author | brunoais <brunoaiss@gmail.com> | 2013-08-03 21:46:06 +0100 |
|---|---|---|
| committer | brunoais <brunoaiss@gmail.com> | 2013-08-03 21:46:06 +0100 |
| commit | 28a0a9e0b1cf77f1be64934f98e4c607d6098362 (patch) | |
| tree | cc84f1754d7670421a6f433fa020f8230e4ba611 /phpBB/includes | |
| parent | 1372b4f20801d6079798832f15caf38949fe9333 (diff) | |
| download | forums-28a0a9e0b1cf77f1be64934f98e4c607d6098362.tar forums-28a0a9e0b1cf77f1be64934f98e4c607d6098362.tar.gz forums-28a0a9e0b1cf77f1be64934f98e4c607d6098362.tar.bz2 forums-28a0a9e0b1cf77f1be64934f98e4c607d6098362.tar.xz forums-28a0a9e0b1cf77f1be64934f98e4c607d6098362.zip | |
[ticket/11639] Changing how censorship is handled.
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11639
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index acf0cc874b..c528d36fef 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1093,13 +1093,12 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id $poster_id = $row['user_id']; $post_subject = $row['post_subject']; - $message = censor_text($row['post_text']); $decoded_message = false; if ($show_quote_button && $auth->acl_get('f_reply', $forum_id)) { - $decoded_message = $message; + $decoded_message = censor_text($row['post_text']); decode_message($decoded_message, $row['bbcode_uid']); $decoded_message = bbcode_nl2br($decoded_message); @@ -1107,8 +1106,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id $parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0); $parse_flags |= ($row['enable_smilies'] ? OPTION_FLAG_SMILIES : 0); - // Do not censor text because it has already been censored before - $message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags, false); + $message = generate_text_for_display($row['post_text'], $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags, true); if (!empty($attachments[$row['post_id']])) { |