diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-09-25 08:41:47 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-09-25 08:41:47 +0000 |
| commit | de25ce87243aaa9d9310d36f189fc051975dc494 (patch) | |
| tree | 351eb71c410984988ae7936761f176540b2b7500 /phpBB/includes/ucp/ucp_pm_compose.php | |
| parent | 023760c8b2402418310a3717db8349cac0342e42 (diff) | |
| download | forums-de25ce87243aaa9d9310d36f189fc051975dc494.tar forums-de25ce87243aaa9d9310d36f189fc051975dc494.tar.gz forums-de25ce87243aaa9d9310d36f189fc051975dc494.tar.bz2 forums-de25ce87243aaa9d9310d36f189fc051975dc494.tar.xz forums-de25ce87243aaa9d9310d36f189fc051975dc494.zip | |
Fix Bug #51835 - editing posts with attachments - regression from r9843 introduced in #48265
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10186 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 | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 1d428ce92e..fba3bfeb32 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -669,22 +669,7 @@ function compose_pm($id, $mode, $action) } // Parse Attachments - before checksum is calculated - if ($action == 'edit') - { - $message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true, $msg_id); - if (sizeof($message_parser->attachment_data)) - { - // Update attachment indicators for pms having attachments now, as a precaution if the pm does not get stored by submit - $sql = 'UPDATE ' . PRIVMSGS_TABLE . ' - SET message_attachment = 1 - WHERE msg_id = ' . $msg_id; - $db->sql_query($sql); - } - } - else - { - $message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true); - } + $message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true); if (sizeof($message_parser->warn_msg) && !($remove_u || $remove_g || $add_to || $add_bcc)) { |