diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-10-21 18:58:06 -0500 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-10-21 18:58:06 -0500 |
| commit | 7c4b7f63fcd044039e4209e3188e63583e5a3718 (patch) | |
| tree | 2ddf54410f17ccef95b5f5526abf117b61d65f82 | |
| parent | 49d91a2cebf6bda8bec06b0803684899f2e35db9 (diff) | |
| parent | faec26b8733facf6ef1d5bbef95011eb81b4db33 (diff) | |
| download | forums-7c4b7f63fcd044039e4209e3188e63583e5a3718.tar forums-7c4b7f63fcd044039e4209e3188e63583e5a3718.tar.gz forums-7c4b7f63fcd044039e4209e3188e63583e5a3718.tar.bz2 forums-7c4b7f63fcd044039e4209e3188e63583e5a3718.tar.xz forums-7c4b7f63fcd044039e4209e3188e63583e5a3718.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | phpBB/includes/mcp/mcp_warn.php | 2 |
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 |