friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fixes issue 7914: Reshares got crumbled

This commit is contained in:
Michael 2019-12-07 21:05:14 +00:00
parent 1de81716b3
commit 23cdc9cec8
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod/item.php
View File

@ -652,6 +652,9 @@ function item_post(App $a) {
if ($orig_post) { if ($orig_post) {
$datarray['edit'] = true; $datarray['edit'] = true;
} else { } else {
// If this was a share, add missing data here
$datarray = Item::addShareDataFromOriginal($datarray);
$datarray['edit'] = false; $datarray['edit'] = false;
} }
@ -730,9 +733,6 @@ function item_post(App $a) {
} }
} }
// If this was a share, add missing data here
$datarray = Item::addShareDataFromOriginal($datarray);
$post_id = Item::insert($datarray); $post_id = Item::insert($datarray);
if (!$post_id) { if (!$post_id) {

5
src/Content/Text/BBCode.php
View File

@ -953,12 +953,11 @@ class BBCode extends BaseObject
public static function convertShare($text, callable $callback) public static function convertShare($text, callable $callback)
{ {
$return = preg_replace_callback( $return = preg_replace_callback(
"/(.*?)\[share(.*?)\](.*?)\[\/share\]/ism", "/(.*?)\[share(.*?)\](.*)\[\/share\]/ism",
function ($match) use ($callback) { function ($match) use ($callback) {
$attribute_string = $match[2]; $attribute_string = $match[2];
$attributes = []; $attributes = [];
foreach(['author', 'profile', 'avatar', 'link', 'posted'] as $field) { foreach (['author', 'profile', 'avatar', 'link', 'posted'] as $field) {
preg_match("/$field=(['\"])(.+?)\\1/ism", $attribute_string, $matches); preg_match("/$field=(['\"])(.+?)\\1/ism", $attribute_string, $matches);
$attributes[$field] = html_entity_decode($matches[2] ?? '', ENT_QUOTES, 'UTF-8'); $attributes[$field] = html_entity_decode($matches[2] ?? '', ENT_QUOTES, 'UTF-8');
} }

2
src/Model/Item.php
View File

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