X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ffeed.php;h=22deff535a2383dd47822296ccb7ee680f3c7d90;hb=3b2cd854837e5df38f75f323aab24e31098812d4;hp=11ccd6af2765ed2418b0629c604158121162b92b;hpb=9c5cd476dd718f3bd4b6dc7b43f53fa61904a193;p=friendica.git

diff --git a/include/feed.php b/include/feed.php
index 11ccd6af27..22deff535a 100644
--- a/include/feed.php
+++ b/include/feed.php
@@ -1,4 +1,5 @@
 <?php
+use Friendica\Database\DBM;
 require_once("include/html2bbcode.php");
 require_once("include/items.php");
 
@@ -235,7 +236,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 		if (!$simulate) {
 			$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s', '%s')",
 				intval($importer["uid"]), dbesc($item["uri"]), dbesc(NETWORK_FEED), dbesc(NETWORK_DFRN));
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG);
 				continue;
 			}
@@ -353,6 +354,10 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 				}
 			}
 
+			// Remove a possible link to the item itself
+			$item["body"] = str_replace($item["plink"], '', $item["body"]);
+			$item["body"] = preg_replace('/\[url\=\](\w+.*?)\[\/url\]/i', '', $item["body"]);
+
 			// Replace the content when the title is longer than the body
 			$replace = (strlen($item["title"]) > strlen($item["body"]));
 
@@ -368,8 +373,9 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 
 			if ($replace) {
 				$item["body"] = $item["title"];
-				$item["title"] = "";
 			}
+			// We always strip the title since it will be added in the page information
+			$item["title"] = "";
 			$item["body"] = $item["body"].add_page_info($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
 			$item["tag"] = add_page_keywords($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
 			$item["object-type"] = ACTIVITY_OBJ_BOOKMARK;