diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-06 00:14:47 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-06 00:14:47 +0100 |
| commit | 1e10664739c2eb212c583ae2fbcdd62fc3d46984 (patch) | |
| tree | 7bac7e002f3a3aa58f8a2f7fd2527992c816bd23 | |
| parent | c5c2f7f7d0f85c8a95271a5abeed0cc4a2bf2678 (diff) | |
| download | forums-1e10664739c2eb212c583ae2fbcdd62fc3d46984.tar forums-1e10664739c2eb212c583ae2fbcdd62fc3d46984.tar.gz forums-1e10664739c2eb212c583ae2fbcdd62fc3d46984.tar.bz2 forums-1e10664739c2eb212c583ae2fbcdd62fc3d46984.tar.xz forums-1e10664739c2eb212c583ae2fbcdd62fc3d46984.zip | |
[ticket/14437] Sort attachments after assigning inline attachments
This does not seem to cause any issues but prevents us from having to consider
the currenty display order.
PHPBB3-14437
| -rw-r--r-- | phpBB/includes/functions_content.php | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index fe4e977ff2..725707f7dc 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -974,18 +974,6 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count, unset($new_attachment_data); } - // Sort correctly - if (!$config['display_order']) - { - // Ascending sort - krsort($attachments); - } - else - { - // Descending sort - ksort($attachments); - } - foreach ($attachments as $attachment) { if (!sizeof($attachment)) @@ -1233,7 +1221,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count, foreach ($matches[0] as $num => $capture) { // Flip index if we are displaying the reverse way - $index = (!$config['display_order']) ? ($tpl_size-($matches[1][$num] + 1)) : $matches[1][$num]; + $index = $tpl_size-($matches[1][$num] + 1); $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])]); @@ -1248,6 +1236,18 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count, $unset_tpl = array_unique($unset_tpl); + // Sort correctly + if ($config['display_order']) + { + // Ascending sort + krsort($attachments); + } + else + { + // Descending sort + ksort($attachments); + } + // Needed to let not display the inlined attachments at the end of the post again foreach ($unset_tpl as $index) { |