diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-08-04 01:56:39 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-08-04 01:56:39 +0200 |
| commit | 3f86d503385734ee887f8a62c35834c13405ea0b (patch) | |
| tree | 697d88e40730988342ea0daecb3c2f4f52f8b2e4 /phpBB/includes/functions_posting.php | |
| parent | 02435f92baa5e03e47125e809c59138945865c6f (diff) | |
| parent | 28a0a9e0b1cf77f1be64934f98e4c607d6098362 (diff) | |
| download | forums-3f86d503385734ee887f8a62c35834c13405ea0b.tar forums-3f86d503385734ee887f8a62c35834c13405ea0b.tar.gz forums-3f86d503385734ee887f8a62c35834c13405ea0b.tar.bz2 forums-3f86d503385734ee887f8a62c35834c13405ea0b.tar.xz forums-3f86d503385734ee887f8a62c35834c13405ea0b.zip | |
Merge remote-tracking branch 'brunoais/ticket11639' into develop
* 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
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 103cc81205..6e62c0c6e4 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1095,25 +1095,20 @@ 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); } - if ($row['bbcode_bitfield']) - { - $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); - } - - $message = bbcode_nl2br($message); - $message = smiley_text($message, !$row['enable_smilies']); + $parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0); + $parse_flags |= ($row['enable_smilies'] ? OPTION_FLAG_SMILIES : 0); + $message = generate_text_for_display($row['post_text'], $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags, true); if (!empty($attachments[$row['post_id']])) { |