aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorBruno Ais <brunoaiss@gmail.com>2013-07-23 12:47:18 +0100
committerBruno Ais <brunoaiss@gmail.com>2013-07-23 12:47:18 +0100
commitc36699811221b17c563a7525b790e0c6c3ab98e0 (patch)
tree245663507a0cfb6800499b2f0dcb3aed8ba01d7f /phpBB
parent67ba959d9b34ff727b77206f4c706b1fbe024cb2 (diff)
downloadforums-c36699811221b17c563a7525b790e0c6c3ab98e0.tar
forums-c36699811221b17c563a7525b790e0c6c3ab98e0.tar.gz
forums-c36699811221b17c563a7525b790e0c6c3ab98e0.tar.bz2
forums-c36699811221b17c563a7525b790e0c6c3ab98e0.tar.xz
forums-c36699811221b17c563a7525b790e0c6c3ab98e0.zip
[ticket/11654] Moved some code to reduce line width.
sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11654
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/mcp/mcp_warn.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 65cf641418..bb21d3d377 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -289,7 +289,8 @@ class mcp_warn
// We want to make the message available here as a reminder
// Parse the message and subject
- $message = generate_text_for_display($user_row['post_text'], $user_row['bbcode_uid'], $user_row['bbcode_bitfield'], ($user_row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
+ $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'))