X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItemContent.php;h=c51f471d8585b4d84fb7fdbb582adebd8fef4785;hb=d9b558a8ede11be1c486d562dfe0495902b57e6e;hp=21dbd34d0a4feb7a7e62d5631c51992123933056;hpb=1ab965c9440a32ab241c9f5e06bea1f7ebb202fd;p=friendica.git

diff --git a/src/Model/ItemContent.php b/src/Model/ItemContent.php
index 21dbd34d0a..c51f471d85 100644
--- a/src/Model/ItemContent.php
+++ b/src/Model/ItemContent.php
@@ -9,6 +9,7 @@ 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';
@@ -68,14 +69,13 @@ class ItemContent extends BaseObject
 		} else {// Try to guess the correct target network
 			switch ($htmlmode) {
 				case 8:
-					$abstract = Text\BBCode::getAbstract($item['body'], NETWORK_TWITTER);
+					$abstract = Text\BBCode::getAbstract($item['body'], Protocol::TWITTER);
 					break;
+
 				case 7:
-					$abstract = Text\BBCode::getAbstract($item['body'], NETWORK_STATUSNET);
-					break;
-				case 6:
-					$abstract = Text\BBCode::getAbstract($item['body'], NETWORK_APPNET);
+					$abstract = Text\BBCode::getAbstract($item['body'], Protocol::STATUSNET);
 					break;
+
 				default: // We don't know the exact target.
 					// We fetch an abstract since there is a posting limit.
 					if ($limit > 0) {
@@ -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') {