aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-07-29 07:26:15 -0700
committerNathan Guse <nathaniel.guse@gmail.com>2013-07-29 07:26:15 -0700
commit7003f98d037f0ff79c43bad6c24e65bb9af7c03a (patch)
tree7f1b138982e835f7b5bbf8f322c9495c78af6f5d
parent6cbe887ea0be71c4796b91b63af07b0a645c105b (diff)
parentc36699811221b17c563a7525b790e0c6c3ab98e0 (diff)
downloadforums-7003f98d037f0ff79c43bad6c24e65bb9af7c03a.tar
forums-7003f98d037f0ff79c43bad6c24e65bb9af7c03a.tar.gz
forums-7003f98d037f0ff79c43bad6c24e65bb9af7c03a.tar.bz2
forums-7003f98d037f0ff79c43bad6c24e65bb9af7c03a.tar.xz
forums-7003f98d037f0ff79c43bad6c24e65bb9af7c03a.zip
Merge pull request #1586 from brunoais/ticket/11654
[ticket/11654] generate_text_for_display on mcp/mcp_warn.php
-rw-r--r--phpBB/includes/mcp/mcp_warn.php15
1 files changed, 2 insertions, 13 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 4ef477775d..bb21d3d377 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -289,19 +289,8 @@ class mcp_warn
// We want to make the message available here as a reminder
// Parse the message and subject
- $message = censor_text($user_row['post_text']);
-
- // Second parse bbcode here
- if ($user_row['bbcode_bitfield'])
- {
- include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
-
- $bbcode = new bbcode($user_row['bbcode_bitfield']);
- $bbcode->bbcode_second_pass($message, $user_row['bbcode_uid'], $user_row['bbcode_bitfield']);
- }
-
- $message = bbcode_nl2br($message);
- $message = smiley_text($message);
+ $parse_flags = OPTION_FLAG_SMILIES | ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0);
+ $message = generate_text_for_display($user_row['post_text'], $user_row['bbcode_uid'], $user_row['bbcode_bitfield'], $parse_flags, true);
// Generate the appropriate user information for the user we are looking at
if (!function_exists('phpbb_get_user_avatar'))