diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-25 11:48:29 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-25 11:48:29 +0100 |
| commit | 7f9ba9849b2bd3c97fd9a828ddb46c83199b9c55 (patch) | |
| tree | 19de4f59168c5d5045aba760784dad9cbe0836e5 /phpBB/viewtopic.php | |
| parent | 6774c5077ddf82eb2f31e92d327ce6905b73c3df (diff) | |
| parent | 3d7d0c40b8e7f1897fc4a323d4edee6db2a7f452 (diff) | |
| download | forums-7f9ba9849b2bd3c97fd9a828ddb46c83199b9c55.tar forums-7f9ba9849b2bd3c97fd9a828ddb46c83199b9c55.tar.gz forums-7f9ba9849b2bd3c97fd9a828ddb46c83199b9c55.tar.bz2 forums-7f9ba9849b2bd3c97fd9a828ddb46c83199b9c55.tar.xz forums-7f9ba9849b2bd3c97fd9a828ddb46c83199b9c55.zip | |
Merge pull request #4190 from marc1706/ticket/14437
[ticket/14437] Correctly assume index from attachment display order
* marc1706/ticket/14437:
[ticket/14437] Make sure attachments array is properly ordered before processing
[ticket/14437] Preserve attachment ID order by ordering by attach_id
[ticket/14437] Sort attachments after assigning inline attachments
[ticket/14437] Correctly assume index from attachment display order
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index eeb6444ceb..780e43e09b 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1479,7 +1479,7 @@ if (sizeof($attach_list)) FROM ' . ATTACHMENTS_TABLE . ' WHERE ' . $db->sql_in_set('post_msg_id', $attach_list) . ' AND in_message = 0 - ORDER BY filetime DESC, post_msg_id ASC'; + ORDER BY attach_id DESC, post_msg_id ASC'; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) |