diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-08-01 16:50:50 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-08-01 16:50:50 +0200 |
| commit | 9f60a3853964b45ab8fe6044ef3b42750f109c76 (patch) | |
| tree | 6630766fcc8068178921bfdca8f1b957f1c9a14d /phpBB/includes/mcp/mcp_topic.php | |
| parent | 498f6ccbfce68420a60408ce389c83a0b516e784 (diff) | |
| parent | 776773522ba129c0e7d0918b2f6beccd4c044dbe (diff) | |
| download | forums-9f60a3853964b45ab8fe6044ef3b42750f109c76.tar forums-9f60a3853964b45ab8fe6044ef3b42750f109c76.tar.gz forums-9f60a3853964b45ab8fe6044ef3b42750f109c76.tar.bz2 forums-9f60a3853964b45ab8fe6044ef3b42750f109c76.tar.xz forums-9f60a3853964b45ab8fe6044ef3b42750f109c76.zip | |
Merge remote-tracking branch 'brunoais/ticket/11653' into develop
* brunoais/ticket/11653:
[ticket/11653] Use $parse_flags
[ticket/11653] generate_text_for_display on mcp/mcp_topic.php
Diffstat (limited to 'phpBB/includes/mcp/mcp_topic.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index d0e4a2e057..b282258c08 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -207,13 +207,8 @@ 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); + $parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES; + $message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags, false); if (!empty($attachments[$row['post_id']])) { |