diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-08-03 17:52:31 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-08-03 17:52:31 +0200 |
| commit | 02435f92baa5e03e47125e809c59138945865c6f (patch) | |
| tree | 841918271e3cd37a90b4585f8edb63c65bfb3bb9 /phpBB/includes/mcp | |
| parent | a4fc7840b15690219a048e78b738f314d679d617 (diff) | |
| parent | a302a09ffbe174e6720ce250121d34ba8b6fd626 (diff) | |
| download | forums-02435f92baa5e03e47125e809c59138945865c6f.tar forums-02435f92baa5e03e47125e809c59138945865c6f.tar.gz forums-02435f92baa5e03e47125e809c59138945865c6f.tar.bz2 forums-02435f92baa5e03e47125e809c59138945865c6f.tar.xz forums-02435f92baa5e03e47125e809c59138945865c6f.zip | |
Merge remote-tracking branch 'brunoais/ticket/11642' into develop
* brunoais/ticket/11642:
[ticket/11642] Use $parse_flags
[ticket/11642] Fixed typo in the variable name.
[ticket/11642] generate_text_for_display on mcp/mcp_post.php
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_post.php | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index 734fa96a78..06f27655ae 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -125,17 +125,8 @@ function mcp_post_details($id, $mode, $action) $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); + $parse_flags = ($post_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES; + $message = generate_text_for_display($post_info['post_text'], $post_info['bbcode_uid'], $post_info['bbcode_bitfield'], $parse_flags, false); if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id'])) { |