sforkowany z mirror/friendica
commit
2b12cd473d
|
@ -652,6 +652,9 @@ function item_post(App $a) {
|
|||
if ($orig_post) {
|
||||
$datarray['edit'] = true;
|
||||
} else {
|
||||
// If this was a share, add missing data here
|
||||
$datarray = Item::addShareDataFromOriginal($datarray);
|
||||
|
||||
$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);
|
||||
|
||||
if (!$post_id) {
|
||||
|
|
|
@ -953,12 +953,11 @@ class BBCode extends BaseObject
|
|||
public static function convertShare($text, callable $callback)
|
||||
{
|
||||
$return = preg_replace_callback(
|
||||
"/(.*?)\[share(.*?)\](.*?)\[\/share\]/ism",
|
||||
"/(.*?)\[share(.*?)\](.*)\[\/share\]/ism",
|
||||
function ($match) use ($callback) {
|
||||
$attribute_string = $match[2];
|
||||
|
||||
$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);
|
||||
$attributes[$field] = html_entity_decode($matches[2] ?? '', ENT_QUOTES, 'UTF-8');
|
||||
}
|
||||
|
|
|
@ -3833,7 +3833,7 @@ class Item extends BaseObject
|
|||
$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']);
|
||||
|
||||
return array_merge($item, $shared_item);
|
||||
|
|
Ładowanie…
Reference in New Issue