diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-08-03 17:47:02 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-08-03 17:47:02 +0200 |
| commit | a4fc7840b15690219a048e78b738f314d679d617 (patch) | |
| tree | 5f03c68c9a93d955ea60ed5ad5ef80b679c6371a | |
| parent | 96cef7f5495bc9242a6629691205ea16da887904 (diff) | |
| parent | ea6938d3e518b636529238ab9ffd5b57b1a19241 (diff) | |
| download | forums-a4fc7840b15690219a048e78b738f314d679d617.tar forums-a4fc7840b15690219a048e78b738f314d679d617.tar.gz forums-a4fc7840b15690219a048e78b738f314d679d617.tar.bz2 forums-a4fc7840b15690219a048e78b738f314d679d617.tar.xz forums-a4fc7840b15690219a048e78b738f314d679d617.zip | |
Merge remote-tracking branch 'brunoais/ticket/11643' into develop
* brunoais/ticket/11643:
[ticket/11643] Use $parse_flags
[ticket/11643] Fixed typo in the variable name.
[ticket/11643] generate_text_for_display on mcp/mcp_queue.php
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 8a9390212f..1fa89af8e1 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -206,17 +206,8 @@ 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); + $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'])) { |