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 | 2a7c514cd074352796b3087a8263dcc552a5c807 (patch) | |
| tree | 73b9ee2b956633bb77acf1f3ad23d32c8f44fcda /phpBB/posting.php | |
| parent | 3eb6f7176ac44b5786379162fc73df3abd196646 (diff) | |
| parent | 7f9ba9849b2bd3c97fd9a828ddb46c83199b9c55 (diff) | |
| download | forums-2a7c514cd074352796b3087a8263dcc552a5c807.tar forums-2a7c514cd074352796b3087a8263dcc552a5c807.tar.gz forums-2a7c514cd074352796b3087a8263dcc552a5c807.tar.bz2 forums-2a7c514cd074352796b3087a8263dcc552a5c807.tar.xz forums-2a7c514cd074352796b3087a8263dcc552a5c807.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[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/posting.php')
| -rw-r--r-- | phpBB/posting.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 692f3c8092..9bd4acf99b 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -602,7 +602,7 @@ if ($post_data['post_attachment'] && !$submit && !$refresh && !$preview && $mode WHERE post_msg_id = $post_id AND in_message = 0 AND is_orphan = 0 - ORDER BY filetime DESC"; + ORDER BY attach_id DESC"; $result = $db->sql_query($sql); $message_parser->attachment_data = array_merge($message_parser->attachment_data, $db->sql_fetchrowset($result)); $db->sql_freeresult($result); |