From: Michael Vogel <icarus@dabo.de>
Date: Sat, 10 Oct 2015 12:26:07 +0000 (+0200)
Subject: Bugfix: Feeds weren't imported if a post with the same URI existed.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ba06d659f17c8ea38fd4d4b90f73684670a12bad;p=friendica.git

Bugfix: Feeds weren't imported if a post with the same URI existed.
---

diff --git a/include/feed.php b/include/feed.php
index dd360a07b5..f11bb52a1b 100644
--- a/include/feed.php
+++ b/include/feed.php
@@ -201,8 +201,8 @@ function feed_import($xml,$importer,&$contact, &$hub) {
 
 		//$item["object"] = $xml;
 
-		$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s'",
-			intval($importer["uid"]), dbesc($item["uri"]));
+		$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` = '%s'",
+			intval($importer["uid"]), dbesc($item["uri"]), dbesc(NETWORK_FEED));
 		if ($r) {
 			logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG);
 			continue;
diff --git a/include/items.php b/include/items.php
index 8691ccca49..1506e737ba 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1489,9 +1489,10 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 	$arr = $unescaped;
 
 	// find the item we just created
-	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d ORDER BY `id` ASC ",
+	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` = '%s' ORDER BY `id` ASC ",
 		dbesc($arr['uri']),
-		intval($arr['uid'])
+		intval($arr['uid']),
+		dbesc($arr['network'])
 	);
 
 	if(count($r)) {