mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
d'oh
git-svn-id: file:///svn/phpbb/trunk@7228 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
cbbc6cabcb
commit
f269de0fd4
1 changed files with 2 additions and 3 deletions
|
@ -347,7 +347,7 @@ function compose_pm($id, $mode, $action)
|
||||||
// Further down (especially in submit_post()) we do not check this again.
|
// Further down (especially in submit_post()) we do not check this again.
|
||||||
$message_parser->get_submitted_attachment_data();
|
$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 *
|
// Do not change to SELECT *
|
||||||
$sql = 'SELECT attach_id, is_orphan, attach_comment, real_filename
|
$sql = 'SELECT attach_id, is_orphan, attach_comment, real_filename
|
||||||
|
@ -588,6 +588,7 @@ function compose_pm($id, $mode, $action)
|
||||||
// Preview
|
// Preview
|
||||||
if (!sizeof($error) && $preview)
|
if (!sizeof($error) && $preview)
|
||||||
{
|
{
|
||||||
|
$user->add_lang('viewtopic');
|
||||||
$preview_message = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false);
|
$preview_message = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false);
|
||||||
|
|
||||||
$preview_signature = $user->data['user_sig'];
|
$preview_signature = $user->data['user_sig'];
|
||||||
|
@ -633,8 +634,6 @@ function compose_pm($id, $mode, $action)
|
||||||
|
|
||||||
if (!sizeof($error))
|
if (!sizeof($error))
|
||||||
{
|
{
|
||||||
$user->add_lang('viewtopic');
|
|
||||||
|
|
||||||
$template->assign_vars(array(
|
$template->assign_vars(array(
|
||||||
'PREVIEW_SUBJECT' => $preview_subject,
|
'PREVIEW_SUBJECT' => $preview_subject,
|
||||||
'PREVIEW_MESSAGE' => $preview_message,
|
'PREVIEW_MESSAGE' => $preview_message,
|
||||||
|
|
Loading…
Add table
Reference in a new issue