Prevent a notice ... again

[friendica.git] / src / Model / ItemContent.php

diff --git a/src/Model/ItemContent.php b/src/Model/ItemContent.php
index fe256d3e76f6b81f8f73f2dfc0e10c7b8d01fdcc..25ae6b84241e3cc4fac78e77dd3f24402527f6ae 100644 (file)
--- 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
 {
@@ -68,14 +65,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 +89,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 +98,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 +156,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'];
                                }