makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1586 from brunoais/ticket/11654

Browse source 
[ticket/11654] generate_text_for_display on mcp/mcp_warn.php
This commit is contained in:
Nathan Guse 2013-07-29 07:26:15 -07:00
commit 7003f98d03
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/includes/mcp/mcp_warn.php
View file

@ -289,19 +289,8 @@ class mcp_warn
// We want to make the message available here as a reminder // We want to make the message available here as a reminder
// Parse the message and subject // Parse the message and subject
$message = censor_text($user_row['post_text']); $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);
// 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);
// Generate the appropriate user information for the user we are looking at // Generate the appropriate user information for the user we are looking at
if (!function_exists('phpbb_get_user_avatar')) if (!function_exists('phpbb_get_user_avatar'))