X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItemContent.php;h=c17625a7565aeb84a03991f5a13023a102ed3085;hb=a2cea16954ab9634b10a3d6358a3c5ebad591538;hp=fe256d3e76f6b81f8f73f2dfc0e10c7b8d01fdcc;hpb=6d88984ee5faafc8d7f704a88aae2e4ae838d8e3;p=friendica.git diff --git a/src/Model/ItemContent.php b/src/Model/ItemContent.php index fe256d3e76..c17625a756 100644 --- a/src/Model/ItemContent.php +++ b/src/Model/ItemContent.php @@ -93,7 +93,7 @@ class ItemContent extends BaseObject } } - $html = Text\BBCode::convert($post['text'] . $post['after'], false, $htmlmode); + $html = Text\BBCode::convert($post['text'] . defaults($post, 'after', ''), false, $htmlmode); $msg = Text\HTML::toPlaintext($html, 0, true); $msg = trim(html_entity_decode($msg, ENT_QUOTES, 'UTF-8')); @@ -102,7 +102,7 @@ class ItemContent extends BaseObject if ($post['type'] == 'link') { $link = $post['url']; } elseif ($post['type'] == 'text') { - $link = $post['url']; + $link = defaults($post, 'url', ''); } elseif ($post['type'] == 'video') { $link = $post['url']; } elseif ($post['type'] == 'photo') { @@ -160,9 +160,8 @@ class ItemContent extends BaseObject } elseif (!isset($post['url'])) { $limit = $limit - 23; $post['url'] = $item['plink']; - // Which purpose has this line? It is now uncommented, but left as a reminder - //} elseif (strpos($b['body'], '[share') !== false) { - // $post['url'] = $b['plink']; + } elseif (strpos($item['body'], '[share') !== false) { + $post['url'] = $item['plink']; } elseif (PConfig::get($item['uid'], 'system', 'no_intelligent_shortening')) { $post['url'] = $item['plink']; }