diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-01-04 17:48:52 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-04 17:48:52 +0100 |
| commit | c5ce0cd3c4d24542e69a6f078a961a66c19a02c2 (patch) | |
| tree | 587b953d27c1daad505efa11a35af6dfb949bb08 /phpBB/includes/ucp/ucp_profile.php | |
| parent | 03be94c1f7ca62adf59700584c944966560a31bd (diff) | |
| parent | e31c895774866f4d98557b0ead087debc0b9d7c3 (diff) | |
| download | forums-c5ce0cd3c4d24542e69a6f078a961a66c19a02c2.tar forums-c5ce0cd3c4d24542e69a6f078a961a66c19a02c2.tar.gz forums-c5ce0cd3c4d24542e69a6f078a961a66c19a02c2.tar.bz2 forums-c5ce0cd3c4d24542e69a6f078a961a66c19a02c2.tar.xz forums-c5ce0cd3c4d24542e69a6f078a961a66c19a02c2.zip | |
Merge pull request #4599 from VSEphpbb/ticket/14945
[ticket/14945] Fix bbcode flags in user sig previews
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 41dcba0387..3356195dd6 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -478,7 +478,9 @@ class ucp_profile $enable_smilies = ($config['allow_sig_smilies']) ? $user->optionget('sig_smilies') : false; $enable_urls = ($config['allow_sig_links']) ? $user->optionget('sig_links') : false; - $decoded_message = generate_text_for_edit($user->data['user_sig'], $user->data['user_sig_bbcode_uid'], $user->data['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->data['user_sig'], $user->data['user_sig_bbcode_uid'], $bbcode_flags); $signature = $request->variable('signature', $decoded_message['text'], true); $signature_preview = ''; |