diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-07-24 09:01:29 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-07-24 09:01:29 +0000 |
| commit | 780854818b22ccdf36fe50e4e4bf5e68027c9e2b (patch) | |
| tree | 5bbea1b2486ca642d37918aae91c7087c8f05bd5 /phpBB/includes/ucp/ucp_pm_compose.php | |
| parent | 433f03107de1162744a1d0b8c9fa3c4ba1b3ed21 (diff) | |
| download | forums-780854818b22ccdf36fe50e4e4bf5e68027c9e2b.tar forums-780854818b22ccdf36fe50e4e4bf5e68027c9e2b.tar.gz forums-780854818b22ccdf36fe50e4e4bf5e68027c9e2b.tar.bz2 forums-780854818b22ccdf36fe50e4e4bf5e68027c9e2b.tar.xz forums-780854818b22ccdf36fe50e4e4bf5e68027c9e2b.zip | |
Fix bug #48265 - Correctly set attachment flag for topics, posts and pms after deleting attachments - Patch by WorldWar and nickvergessen
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9843 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, 16 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index edee64bd18..cf82925e1d 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -665,7 +665,22 @@ function compose_pm($id, $mode, $action) } // Parse Attachments - before checksum is calculated - $message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true); + 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); + } if (sizeof($message_parser->warn_msg) && !($remove_u || $remove_g || $add_to || $add_bcc)) { |