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

Merge pull request #11031 from MrPetovan/bug/9720-share-preg_replace

Browse source 
Escape dollar sign in replace string to prevent placeholder replacement in Model\Item::addShareDataFromOriginal
This commit is contained in:
Michael Vogel 2021-11-26 20:42:50 +01:00 committed by GitHub
commit b03b1fe367
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Item.php
View file

@ -3354,7 +3354,7 @@ class Item
$body = $shared_item['body']; $body = $shared_item['body'];
} }
$item['body'] = preg_replace("/\[share ([^\[\]]*)\].*\[\/share\]/ism", '[share $1]' . $body . '[/share]', $item['body']); $item['body'] = preg_replace("/\[share ([^\[\]]*)\].*\[\/share\]/ism", '[share $1]' . str_replace('$', '\$', $body) . '[/share]', $item['body']);
unset($shared_item['body']); unset($shared_item['body']);
return array_merge($item, $shared_item); return array_merge($item, $shared_item);