diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-01-06 01:06:06 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-06 01:06:06 +0100 |
| commit | 864953ebff457c15f5a62f3f9c469b3293190a36 (patch) | |
| tree | 39c2c3dc98a4afcd159a65f3e043581e4f3f3569 /phpBB | |
| parent | 0c6c94e527fca6edc0d79430088142f4828610e4 (diff) | |
| parent | 777a1ad916e1e01cd2e7e988497a1b49d8500923 (diff) | |
| download | forums-864953ebff457c15f5a62f3f9c469b3293190a36.tar forums-864953ebff457c15f5a62f3f9c469b3293190a36.tar.gz forums-864953ebff457c15f5a62f3f9c469b3293190a36.tar.bz2 forums-864953ebff457c15f5a62f3f9c469b3293190a36.tar.xz forums-864953ebff457c15f5a62f3f9c469b3293190a36.zip | |
Merge pull request #4616 from marc1706/ticket/14945
[ticket/14945] Parse signature preview with generate_text_for_display()
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index b61a9fab9f..b3c0752a2f 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -889,13 +889,8 @@ function compose_pm($id, $mode, $action, $user_folders = array()) // Signature if ($enable_sig && $config['allow_sig'] && $preview_signature) { - $parse_sig = new parse_message($preview_signature); - $parse_sig->bbcode_uid = $preview_signature_uid; - $parse_sig->bbcode_bitfield = $preview_signature_bitfield; - - $parse_sig->format_display($config['allow_sig_bbcode'], $config['allow_sig_links'], $config['allow_sig_smilies']); - $preview_signature = $parse_sig->message; - unset($parse_sig); + $bbcode_flags = ($enable_bbcode ? OPTION_FLAG_BBCODE : 0) + ($enable_smilies ? OPTION_FLAG_SMILIES : 0) + ($enable_urls ? OPTION_FLAG_LINKS : 0); + $preview_signature = generate_text_for_display($preview_signature, $preview_signature_uid, $preview_signature_bitfield, $bbcode_flags); } else { |