X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ffeed.php;h=579ff7caae3652cce6c9fcb714720886bd32334f;hb=d242e72c656e6185e634ba6978783c2596f0918a;hp=97c20c3980581863ca2996f9b58b7b22c29b0d10;hpb=c825cc8d0d61386cb00b6310fc4ea46c4354460d;p=friendica.git

diff --git a/include/feed.php b/include/feed.php
index 97c20c3980..579ff7caae 100644
--- a/include/feed.php
+++ b/include/feed.php
@@ -59,8 +59,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 				if ($attributes->name == "href")
 					$author["author-link"] = $attributes->textContent;
 
-		$author["author-id"] = $xpath->evaluate('/atom:feed/atom:author/atom:uri/text()')->item(0)->nodeValue;
-
 		if ($author["author-link"] == "")
 			$author["author-link"] = $author["author-id"];
 
@@ -144,10 +142,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 		$author["owner-link"] = $contact["url"];
 		$author["owner-name"] = $contact["name"];
 		$author["owner-avatar"] = $contact["thumb"];
-
-		// This is no field in the item table. So we have to unset it.
-		unset($author["author-nick"]);
-		unset($author["author-id"]);
 	}
 
 	$header = array();
@@ -331,6 +325,14 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 			logger("Stored feed: ".print_r($item, true), LOGGER_DEBUG);
 
 			$notify = item_is_remote_self($contact, $item);
+
+			// Distributed items should have a well formatted URI.
+			// Additionally we have to avoid conflicts with identical URI between imported feeds and these items.
+			if ($notify) {
+				unset($item['uri']);
+				unset($item['parent-uri']);
+			}
+
 			$id = item_store($item, false, $notify);
 
 			logger("Feed for contact ".$contact["url"]." stored under id ".$id);