diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2013-07-18 16:15:36 +0100 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2013-07-18 16:15:36 +0100 |
| commit | 16b411616575cdd4023fb42bb77b56e43db735e0 (patch) | |
| tree | 4e004d3027e9c40de502b20fb2c6f3d9d3985406 /phpBB/includes/mcp/mcp_warn.php | |
| parent | b5651c0289054f2f4453806200506968241f9a82 (diff) | |
| download | forums-16b411616575cdd4023fb42bb77b56e43db735e0.tar forums-16b411616575cdd4023fb42bb77b56e43db735e0.tar.gz forums-16b411616575cdd4023fb42bb77b56e43db735e0.tar.bz2 forums-16b411616575cdd4023fb42bb77b56e43db735e0.tar.xz forums-16b411616575cdd4023fb42bb77b56e43db735e0.zip | |
[ticket/11654] generate_text_for_display on mcp/mcp_warn.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11654
Diffstat (limited to 'phpBB/includes/mcp/mcp_warn.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_warn.php | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index 4ef477775d..d0fcd8a77d 100644 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -289,19 +289,7 @@ 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); + $message = generate_text_for_display($message, $user_row['bbcode_uid'], $user_row['bbcode_bitfield'], ($user_row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true); // Generate the appropriate user information for the user we are looking at if (!function_exists('phpbb_get_user_avatar')) |