diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-12-16 15:48:23 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-12-16 15:48:23 +0000 |
| commit | b68de2323d6444b4b3685a98bbcb9500a38e45cb (patch) | |
| tree | 6046a64891cfc1c2edb3f4b42b0e799f2921c155 /phpBB/includes/ucp/ucp_pm_compose.php | |
| parent | 51d173ff1e6d3764be4701b92ecfd68007ad1c81 (diff) | |
| download | forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.gz forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.bz2 forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.xz forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.zip | |
merge changes from 3.0.x branch
git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_compose.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 2f56bcdf7a..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); } @@ -811,7 +811,7 @@ function compose_pm($id, $mode, $action) } // Decode text for message display - $bbcode_uid = (($action == 'quote' || $action == 'forward') && !$preview && !$refresh) ? $bbcode_uid : $message_parser->bbcode_uid; + $bbcode_uid = (($action == 'quote' || $action == 'forward') && !$preview && !$refresh && (!sizeof($error) || (sizeof($error) && !$submit))) ? $bbcode_uid : $message_parser->bbcode_uid; $message_parser->decode_message($bbcode_uid); |