keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12363 from annando/bulk-images

Browse source 
Add images in a loop (preparation for a gallery)
This commit is contained in:
Hypolite Petovan 2022-12-08 08:38:52 -05:00 committed by GitHub
commit 6fddcb2c04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/Model/Item.php
View file

@ -3217,8 +3217,9 @@ class Item
private static function addVisualAttachments(array $attachments, array $item, string $content, bool $shared): string private static function addVisualAttachments(array $attachments, array $item, string $content, bool $shared): string
{ {
DI::profiler()->startRecording('rendering'); DI::profiler()->startRecording('rendering');
$leading = ''; $leading = '';
$trailing = ''; $trailing = '';
$images = [];
// @todo In the future we should make a single for the template engine with all media in it. This allows more flexibilty. // @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) { foreach ($attachments['visual'] as $attachment) {
@ -3273,19 +3274,19 @@ class Item
if (self::containsLink($item['body'], $src_url)) { if (self::containsLink($item['body'], $src_url)) {
continue; continue;
} }
$media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image.tpl'), [ $images[] = ['src' => $src_url, 'preview' => $preview_url, 'attachment' => $attachment];
'$image' => [ }
'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) { // On Diaspora posts the attached pictures are leading
$leading .= $media; if ($item['network'] == Protocol::DIASPORA) {
} else { $leading .= $media;
$trailing .= $media; } else {
} $trailing .= $media;
} }
} }