diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2009-12-12 00:06:01 +0000 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2009-12-12 00:06:01 +0000 |
commit | f593ae1f357aeedca1a3a0bd7bfffa654d82fa1c (patch) | |
tree | fbc20e7e52099fe2e68c54cfe00d688fccd98ce8 | |
parent | d7a6e63a9a21d74dc146cb8ddcdd0daca539559a (diff) | |
download | forums-f593ae1f357aeedca1a3a0bd7bfffa654d82fa1c.tar forums-f593ae1f357aeedca1a3a0bd7bfffa654d82fa1c.tar.gz forums-f593ae1f357aeedca1a3a0bd7bfffa654d82fa1c.tar.bz2 forums-f593ae1f357aeedca1a3a0bd7bfffa654d82fa1c.tar.xz forums-f593ae1f357aeedca1a3a0bd7bfffa654d82fa1c.zip |
[Fix] Use correct BBCode parseoptions in signatures when previewing PMs.
Authorised by: bantu
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10325 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
-rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 846c71f738..0705154a9b 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -114,6 +114,7 @@ <li>[Fix] Add missing language entries. (Bug #55095)</li> <li>[Fix] Do not permit unauthorised users to delete private messages from folder listing. (Bug #54355)</li> <li>[Fix] Correctly check for empty strings in custom profile fields. (Bug #55335)</li> + <li>[Fix] Use correct options to parse BBCodes in signatures when previewing PMs.</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> <li>[Change] Use em dash instead of hyphen/minus as separator in ATOM Feeds item statistics. (Bug #53565)</li> diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index d9e3deaa41..4d72d45f81 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -767,7 +767,7 @@ function compose_pm($id, $mode, $action) $parse_sig->bbcode_uid = $preview_signature_uid; $parse_sig->bbcode_bitfield = $preview_signature_bitfield; - $parse_sig->format_display($enable_bbcode, $enable_urls, $enable_smilies); + $parse_sig->format_display($config['allow_sig_bbcode'], $config['allow_sig_links'], $config['allow_sig_smilies']); $preview_signature = $parse_sig->message; unset($parse_sig); } |