diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2013-07-16 21:20:22 +0100 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2013-07-16 21:20:22 +0100 |
| commit | 596e9bb69df2f5d0c07c0b8201cc770bbe5253a0 (patch) | |
| tree | 02cb2b698ba8f3f49b07f30813dda8f0915d6a71 | |
| parent | b5651c0289054f2f4453806200506968241f9a82 (diff) | |
| download | forums-596e9bb69df2f5d0c07c0b8201cc770bbe5253a0.tar forums-596e9bb69df2f5d0c07c0b8201cc770bbe5253a0.tar.gz forums-596e9bb69df2f5d0c07c0b8201cc770bbe5253a0.tar.bz2 forums-596e9bb69df2f5d0c07c0b8201cc770bbe5253a0.tar.xz forums-596e9bb69df2f5d0c07c0b8201cc770bbe5253a0.zip | |
[ticket/11643] generate_text_for_display on mcp/mcp_queue.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11643
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 24afa1f210..14490343c2 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -132,17 +132,7 @@ class mcp_queue $post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false; // Process message, leave it uncensored - $message = $post_info['post_text']; - - if ($post_info['bbcode_bitfield']) - { - include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); - $bbcode = new bbcode($post_info['bbcode_bitfield']); - $bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']); - } - - $message = bbcode_nl2br($message); - $message = smiley_text($message); + $message = generate_text_for_display($post_info['message_text'], $post_info['bbcode_uid'], $post_info['bbcode_bitfield'], ($post_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, false); if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id'])) { |