X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItemContent.php;h=136323385c9c3355d1857ca1f909125e76a499b4;hb=08edeae2f996854d0028d0f73a08a1f3ee7741da;hp=c51f471d8585b4d84fb7fdbb582adebd8fef4785;hpb=e06fc2aa6900d8cf5ae4e8d5cf52f9262bf7ada7;p=friendica.git diff --git a/src/Model/ItemContent.php b/src/Model/ItemContent.php index c51f471d85..136323385c 100644 --- a/src/Model/ItemContent.php +++ b/src/Model/ItemContent.php @@ -6,16 +6,11 @@ namespace Friendica\Model; -use Friendica\BaseObject; use Friendica\Content\Text; use Friendica\Core\PConfig; use Friendica\Core\Protocol; -require_once 'boot.php'; -require_once 'include/items.php'; -require_once 'include/text.php'; - -class ItemContent extends BaseObject +class ItemContent { /** * @brief Convert a message into plaintext for connectors to other networks @@ -26,9 +21,10 @@ class ItemContent extends BaseObject * @param int $htmlmode This controls the behavior of the BBCode conversion * @param string $target_network Name of the network where the post should go to. * - * @see \Friendica\Content\Text\BBCode::getAttachedData - * * @return array Same array structure than \Friendica\Content\Text\BBCode::getAttachedData + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @see \Friendica\Content\Text\BBCode::getAttachedData + * */ public static function getPlaintextPost($item, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = '') { @@ -93,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')); @@ -102,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') {