diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2013-07-16 21:28:06 +0100 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2013-07-16 21:28:06 +0100 |
| commit | d183431894b85ca2ebc778ccb8fd52ecf91082fb (patch) | |
| tree | 527488f6b30ca63125726c2841cf303dfc8e9655 /phpBB/includes/mcp | |
| parent | b5651c0289054f2f4453806200506968241f9a82 (diff) | |
| download | forums-d183431894b85ca2ebc778ccb8fd52ecf91082fb.tar forums-d183431894b85ca2ebc778ccb8fd52ecf91082fb.tar.gz forums-d183431894b85ca2ebc778ccb8fd52ecf91082fb.tar.bz2 forums-d183431894b85ca2ebc778ccb8fd52ecf91082fb.tar.xz forums-d183431894b85ca2ebc778ccb8fd52ecf91082fb.zip | |
[ticket/11653] generate_text_for_display on mcp/mcp_topic.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11653
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index e3dd5a6b57..3491f37bcb 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -213,13 +213,7 @@ function mcp_topic_view($id, $mode, $action) $message = $row['post_text']; $post_subject = ($row['post_subject'] != '') ? $row['post_subject'] : $topic_info['topic_title']; - if ($row['bbcode_bitfield']) - { - $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); - } - - $message = bbcode_nl2br($message); - $message = smiley_text($message); + $message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, false); if (!empty($attachments[$row['post_id']])) { |