Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12526] Fix undefined index: filesize when editing PM with attachments.
This commit is contained in:
Joas Schilling 2014-05-11 18:09:56 +02:00
commit 90c2bf26c0

View file

@ -492,7 +492,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
if ($message_attachment && !$submit && !$refresh && !$preview && $action == 'edit')
{
// 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, filesize
FROM ' . ATTACHMENTS_TABLE . "
WHERE post_msg_id = $msg_id
AND in_message = 1