aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-10-21 18:57:43 -0500
committerMarc Alexander <admin@m-a-styles.de>2014-10-21 18:57:43 -0500
commitfaec26b8733facf6ef1d5bbef95011eb81b4db33 (patch)
tree647e7589d70d58c7dcf870af42f639a07d80b12b
parent0de7adfa37c9cdf3f7b015c2a6f11341e7f10405 (diff)
parentdefeb1a56f9c184668a9211fc6b6f55117359efe (diff)
downloadforums-faec26b8733facf6ef1d5bbef95011eb81b4db33.tar
forums-faec26b8733facf6ef1d5bbef95011eb81b4db33.tar.gz
forums-faec26b8733facf6ef1d5bbef95011eb81b4db33.tar.bz2
forums-faec26b8733facf6ef1d5bbef95011eb81b4db33.tar.xz
forums-faec26b8733facf6ef1d5bbef95011eb81b4db33.zip
Merge pull request #3053 from Senky/ticket/13194
[ticket/13194] BBCode isn't parsed when issuing a warning for a post
-rw-r--r--phpBB/includes/mcp/mcp_warn.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 425c3ac235..d724b8703b 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -332,7 +332,7 @@ class mcp_warn
// We want to make the message available here as a reminder
// Parse the message and subject
- $parse_flags = OPTION_FLAG_SMILIES | ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0);
+ $parse_flags = OPTION_FLAG_SMILIES | ($user_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