X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FItemContent.php;h=6d03ae3253b28c8e51ae6de236b9b5803756c248;hb=0b976ad193a2c3ab824905861a3d59d4d3c200d8;hp=fe256d3e76f6b81f8f73f2dfc0e10c7b8d01fdcc;hpb=6d88984ee5faafc8d7f704a88aae2e4ae838d8e3;p=friendica.git

diff --git a/src/Model/ItemContent.php b/src/Model/ItemContent.php
index fe256d3e76..6d03ae3253 100644
--- a/src/Model/ItemContent.php
+++ b/src/Model/ItemContent.php
@@ -9,10 +9,7 @@ namespace Friendica\Model;
 use Friendica\BaseObject;
 use Friendica\Content\Text;
 use Friendica\Core\PConfig;
-
-require_once 'boot.php';
-require_once 'include/items.php';
-require_once 'include/text.php';
+use Friendica\Core\Protocol;
 
 class ItemContent extends BaseObject
 {
@@ -25,9 +22,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 = '')
 	{
@@ -68,14 +66,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 +90,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 +99,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 +157,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'];
 				}