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

Merge pull request #12912 from HankG/fix-cant-remove-attachment 

Fix cant remove attachment
This commit is contained in:
Hypolite Petovan 2023-03-18 22:17:14 -04:00 committed by GitHub
parent 34b575233a 6db244f476
commit d886a53af0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Item.php
View File

@ -201,6 +201,8 @@ class Item
$notify_items = [];
while ($item = DBA::fetch($items)) {
Post\Media::deleteByURIId($item['uri-id'], [Post\Media::HTML]);
if (!empty($fields['body'])) {
if (!empty($item['quote-uri-id'])) {
$fields['body'] = BBCode::removeSharedData($fields['body']);

16
view/js/linkPreview.js
View File

@ -548,12 +548,12 @@
matches = attributes.match(/url='([\s\S]*?)'/im);
if (matches !== null && typeof matches[1] !== 'undefined') {
url = matches[1].toLowerCase();
url = matches[1];
}
matches = attributes.match(/url="([\s\S]*?)"/im);
if (matches !== null && typeof matches[1] !== 'undefined') {
url = matches[1].toLowerCase();
url = matches[1];
}
if(url !== '') {
@ -564,12 +564,12 @@
matches = attributes.match(/title='([\s\S]*?)'/im);
if (matches !== null && typeof matches[1] !== 'undefined') {
title = matches[1].toLowerCase();
title = trim(matches[1]);
}
matches = attributes.match(/title="([\s\S]*?)"/im);
if (matches !== null && typeof matches[1] !== 'undefined') {
title = matches[1].toLowerCase();
title = trim(matches[1]);
}
if (title !== '') {
@ -580,12 +580,12 @@
matches = attributes.match(/image='([\s\S]*?)'/im);
if (matches !== null && typeof matches[1] !== 'undefined') {
image = matches[1].toLowerCase();
image = trim(matches[1]);
}
matches = attributes.match(/image="([\s\S]*?)"/im);
if (matches !== null && typeof matches[1] !== 'undefined') {
image = matches[1].toLowerCase();
image = trim(matches[1]);
}
if (image !== '') {
@ -596,12 +596,12 @@
matches = attributes.match(/preview='([\s\S]*?)'/im);
if (matches !== null && typeof matches[1] !== 'undefined') {
preview = matches[1].toLowerCase();
preview = trim(matches[1]);
}
matches = attributes.match(/preview="([\s\S]*?)"/im);
if (matches !== null && typeof matches[1] !== 'undefined') {
preview = matches[1].toLowerCase();
preview = trim(matches[1]);
}
if (preview !== '') {