From 741469a5c5a0ba78b343823117cbf881ae6594fe Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 8 Dec 2022 07:16:25 +0000 Subject: [PATCH] Add images in a loop (preparation for a galery) --- src/Model/Item.php | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 0407af8f8..ff4791a7c 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -3217,8 +3217,9 @@ class Item private static function addVisualAttachments(array $attachments, array $item, string $content, bool $shared): string { DI::profiler()->startRecording('rendering'); - $leading = ''; + $leading = ''; $trailing = ''; + $images = []; // @todo In the future we should make a single for the template engine with all media in it. This allows more flexibilty. foreach ($attachments['visual'] as $attachment) { @@ -3273,19 +3274,19 @@ class Item if (self::containsLink($item['body'], $src_url)) { continue; } - $media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image.tpl'), [ - '$image' => [ - 'src' => $src_url, - 'preview' => $preview_url, - 'attachment' => $attachment, - ], - ]); - // On Diaspora posts the attached pictures are leading - if ($item['network'] == Protocol::DIASPORA) { - $leading .= $media; - } else { - $trailing .= $media; - } + $images[] = ['src' => $src_url, 'preview' => $preview_url, 'attachment' => $attachment]; + } + } + + foreach ($images as $image) { + $media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image.tpl'), [ + '$image' => $image, + ]); + // On Diaspora posts the attached pictures are leading + if ($item['network'] == Protocol::DIASPORA) { + $leading .= $media; + } else { + $trailing .= $media; } }