Merge pull request #12379 from annando/id-for-image

ID added for list of images in a post
This commit is contained in:
Hypolite Petovan 2022-12-10 14:46:19 -05:00 committed by GitHub
commit 106dac5508
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -273,8 +273,8 @@ class BBCode
// Get all linked images with alternative image description // Get all linked images with alternative image description
if (preg_match_all("/\[img=(http[^\[\]]*)\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures, PREG_SET_ORDER)) { if (preg_match_all("/\[img=(http[^\[\]]*)\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures, PREG_SET_ORDER)) {
foreach ($pictures as $picture) { foreach ($pictures as $picture) {
if (Photo::isLocal($picture[1])) { if ($id = Photo::getIdForName($picture[1])) {
$post['images'][] = ['url' => str_replace('-1.', '-0.', $picture[1]), 'description' => $picture[2]]; $post['images'][] = ['url' => str_replace('-1.', '-0.', $picture[1]), 'description' => $picture[2], 'id' => $id];
} else { } else {
$post['remote_images'][] = ['url' => $picture[1], 'description' => $picture[2]]; $post['remote_images'][] = ['url' => $picture[1], 'description' => $picture[2]];
} }
@ -286,8 +286,8 @@ class BBCode
if (preg_match_all("/\[img\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures, PREG_SET_ORDER)) { if (preg_match_all("/\[img\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures, PREG_SET_ORDER)) {
foreach ($pictures as $picture) { foreach ($pictures as $picture) {
if (Photo::isLocal($picture[1])) { if ($id = Photo::getIdForName($picture[1])) {
$post['images'][] = ['url' => str_replace('-1.', '-0.', $picture[1]), 'description' => '']; $post['images'][] = ['url' => str_replace('-1.', '-0.', $picture[1]), 'description' => '', 'id' => $id];
} else { } else {
$post['remote_images'][] = ['url' => $picture[1], 'description' => '']; $post['remote_images'][] = ['url' => $picture[1], 'description' => ''];
} }