diff options
| author | Matt Friedman <maf675@gmail.com> | 2016-12-28 09:18:35 -0800 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2016-12-28 09:18:35 -0800 |
| commit | e31c895774866f4d98557b0ead087debc0b9d7c3 (patch) | |
| tree | 08f59be5229cf8b5511b3aa57b5a6319763ffb0d /phpBB/includes/acp/acp_users.php | |
| parent | 544c7c4e0864df7ad1748c21b92a146e84308a06 (diff) | |
| download | forums-e31c895774866f4d98557b0ead087debc0b9d7c3.tar forums-e31c895774866f4d98557b0ead087debc0b9d7c3.tar.gz forums-e31c895774866f4d98557b0ead087debc0b9d7c3.tar.bz2 forums-e31c895774866f4d98557b0ead087debc0b9d7c3.tar.xz forums-e31c895774866f4d98557b0ead087debc0b9d7c3.zip | |
[ticket/14945] Send bbcode flags in user sig previews
PHPBB3-14945
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 25e9d6f658..5a2b1445dc 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -2018,7 +2018,9 @@ class acp_users $enable_smilies = ($config['allow_sig_smilies']) ? $this->optionget($user_row, 'sig_smilies') : false; $enable_urls = ($config['allow_sig_links']) ? $this->optionget($user_row, 'sig_links') : false; - $decoded_message = generate_text_for_edit($user_row['user_sig'], $user_row['user_sig_bbcode_uid'], $user_row['user_sig_bbcode_bitfield']); + $bbcode_flags = ($enable_bbcode ? OPTION_FLAG_BBCODE : 0) + ($enable_smilies ? OPTION_FLAG_SMILIES : 0) + ($enable_urls ? OPTION_FLAG_LINKS : 0); + + $decoded_message = generate_text_for_edit($user_row['user_sig'], $user_row['user_sig_bbcode_uid'], $bbcode_flags); $signature = $request->variable('signature', $decoded_message['text'], true); $signature_preview = ''; |