makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'brunoais/ticket11639' into develop

Browse source 
* brunoais/ticket11639:
  [ticket/11639] Changing how censorship is handled.
  [ticket/11639] Removed a non-needed unset
  [ticket/11639] Whitespace fixing
  [ticket/11639] Whitespace fixing
  [ticket/11639] Added an useful comment.
  [ticket/11639] generate_text_for_display on functions_posting.php
This commit is contained in:
Joas Schilling 2013-08-04 01:56:39 +02:00
commit 3f86d50338
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
phpBB/includes/functions_posting.php
View file

@ -1095,25 +1095,20 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
$poster_id = $row['user_id']; $poster_id = $row['user_id'];
$post_subject = $row['post_subject']; $post_subject = $row['post_subject'];
$message = censor_text($row['post_text']);
$decoded_message = false; $decoded_message = false;
if ($show_quote_button && $auth->acl_get('f_reply', $forum_id)) 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']); decode_message($decoded_message, $row['bbcode_uid']);
$decoded_message = bbcode_nl2br($decoded_message); $decoded_message = bbcode_nl2br($decoded_message);
} }
if ($row['bbcode_bitfield']) $parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0);
{ $parse_flags |= ($row['enable_smilies'] ? OPTION_FLAG_SMILIES : 0);
$bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); $message = generate_text_for_display($row['post_text'], $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags, true);
}
$message = bbcode_nl2br($message);
$message = smiley_text($message, !$row['enable_smilies']);
if (!empty($attachments[$row['post_id']])) if (!empty($attachments[$row['post_id']]))
{ {