diff options
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 52b2bbbb4d..f121c1d638 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -347,7 +347,7 @@ function compose_pm($id, $mode, $action) // Further down (especially in submit_post()) we do not check this again. $message_parser->get_submitted_attachment_data(); - if ($message_attachment && !$submit && !$refresh && !$ && $action == 'edit') + if ($message_attachment && !$submit && !$refresh && !$preview && $action == 'edit') { // Do not change to SELECT * $sql = 'SELECT attach_id, is_orphan, attach_comment, real_filename @@ -588,6 +588,7 @@ function compose_pm($id, $mode, $action) // Preview if (!sizeof($error) && $preview) { + $user->add_lang('viewtopic'); $preview_message = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false); $preview_signature = $user->data['user_sig']; @@ -633,8 +634,6 @@ function compose_pm($id, $mode, $action) if (!sizeof($error)) { - $user->add_lang('viewtopic'); - $template->assign_vars(array( 'PREVIEW_SUBJECT' => $preview_subject, 'PREVIEW_MESSAGE' => $preview_message, |