X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItemContent.php;h=136323385c9c3355d1857ca1f909125e76a499b4;hb=08edeae2f996854d0028d0f73a08a1f3ee7741da;hp=6d03ae3253b28c8e51ae6de236b9b5803756c248;hpb=854cc3e47296d4a1b01b893376064cf254d84f79;p=friendica.git diff --git a/src/Model/ItemContent.php b/src/Model/ItemContent.php index 6d03ae3253..136323385c 100644 --- a/src/Model/ItemContent.php +++ b/src/Model/ItemContent.php @@ -6,12 +6,11 @@ namespace Friendica\Model; -use Friendica\BaseObject; use Friendica\Content\Text; use Friendica\Core\PConfig; use Friendica\Core\Protocol; -class ItemContent extends BaseObject +class ItemContent { /** * @brief Convert a message into plaintext for connectors to other networks @@ -90,7 +89,7 @@ class ItemContent extends BaseObject } } - $html = Text\BBCode::convert($post['text'] . defaults($post, 'after', ''), false, $htmlmode); + $html = Text\BBCode::convert($post['text'] . ($post['after'] ?? ''), false, $htmlmode); $msg = Text\HTML::toPlaintext($html, 0, true); $msg = trim(html_entity_decode($msg, ENT_QUOTES, 'UTF-8')); @@ -99,7 +98,7 @@ class ItemContent extends BaseObject if ($post['type'] == 'link') { $link = $post['url']; } elseif ($post['type'] == 'text') { - $link = defaults($post, 'url', ''); + $link = $post['url'] ?? ''; } elseif ($post['type'] == 'video') { $link = $post['url']; } elseif ($post['type'] == 'photo') {