makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 06:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14437] Make sure attachments array is properly ordered before processing

Browse source 
PHPBB3-14437
This commit is contained in:
Marc Alexander 2016-03-06 11:22:05 +01:00
parent f1772ce7e5
commit 3d7d0c40b8
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/functions_content.php
View file

@ -974,6 +974,9 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
unset($new_attachment_data); unset($new_attachment_data);
} }
// Make sure attachments are properly ordered
ksort($attachments);
foreach ($attachments as $attachment) foreach ($attachments as $attachment)
{ {
if (!sizeof($attachment)) if (!sizeof($attachment))
@ -1211,8 +1214,6 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
$attachments = $compiled_attachments; $attachments = $compiled_attachments;
unset($compiled_attachments); unset($compiled_attachments);
$tpl_size = sizeof($attachments);
$unset_tpl = array(); $unset_tpl = array();
preg_match_all('#<!\-\- ia([0-9]+) \-\->(.*?)<!\-\- ia\1 \-\->#', $message, $matches, PREG_PATTERN_ORDER); preg_match_all('#<!\-\- ia([0-9]+) \-\->(.*?)<!\-\- ia\1 \-\->#', $message, $matches, PREG_PATTERN_ORDER);
@ -1220,8 +1221,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
$replace = array(); $replace = array();
foreach ($matches[0] as $num => $capture) foreach ($matches[0] as $num => $capture)
{ {
// Flip index if we are displaying the reverse way $index = $matches[1][$num];
$index = $tpl_size-($matches[1][$num] + 1);
$replace['from'][] = $matches[0][$num]; $replace['from'][] = $matches[0][$num];
$replace['to'][] = (isset($attachments[$index])) ? $attachments[$index] : sprintf($user->lang['MISSING_INLINE_ATTACHMENT'], $matches[2][array_search($index, $matches[1])]); $replace['to'][] = (isset($attachments[$index])) ? $attachments[$index] : sprintf($user->lang['MISSING_INLINE_ATTACHMENT'], $matches[2][array_search($index, $matches[1])]);

2
phpBB/posting.php
View file

@ -599,7 +599,7 @@ if ($post_data['post_attachment'] && !$submit && !$refresh && !$preview && $mode
WHERE post_msg_id = $post_id WHERE post_msg_id = $post_id
AND in_message = 0 AND in_message = 0
AND is_orphan = 0 AND is_orphan = 0
ORDER BY filetime DESC"; ORDER BY attach_id DESC";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$message_parser->attachment_data = array_merge($message_parser->attachment_data, $db->sql_fetchrowset($result)); $message_parser->attachment_data = array_merge($message_parser->attachment_data, $db->sql_fetchrowset($result));
$db->sql_freeresult($result); $db->sql_freeresult($result);