clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12569 from MrPetovan/bug/12559-attachment-images 

Remove attachment tags before checking for end of body images
This commit is contained in:
Michael Vogel 2022-12-30 09:42:20 +01:00 committed by GitHub
parent 5af956b92f 12df6297d7
commit e78e68789e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Model/Item.php
View File

@ -3016,6 +3016,8 @@ class Item
$item['hashtags'] = $tags['hashtags']; $item['hashtags'] = $tags['hashtags'];
$item['mentions'] = $tags['mentions']; $item['mentions'] = $tags['mentions'];
$item['body'] = preg_replace("#\s*\[attachment .*?].*?\[/attachment]\s*#ism", "\n", $item['body']);
if (!$is_preview) { if (!$is_preview) {
$item['body'] = Post\Media::removeFromEndOfBody($item['body'] ?? ''); $item['body'] = Post\Media::removeFromEndOfBody($item['body'] ?? '');
} }
@ -3065,8 +3067,6 @@ class Item
$attachments = Post\Media::splitAttachments($item['uri-id'], $shared_links, $item['has-media'] ?? false); $attachments = Post\Media::splitAttachments($item['uri-id'], $shared_links, $item['has-media'] ?? false);
$item['body'] = self::replaceVisualAttachments($attachments, $item['body'] ?? ''); $item['body'] = self::replaceVisualAttachments($attachments, $item['body'] ?? '');
$item['body'] = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", "\n", $item['body']);
self::putInCache($item); self::putInCache($item);
$item['body'] = $body; $item['body'] = $body;
$s = $item["rendered-html"]; $s = $item["rendered-html"];
@ -3166,7 +3166,7 @@ class Item
], ],
]); ]);
} }
/** /**
* Check if the body contains a link * Check if the body contains a link