Bugfix: The duplicate check sometimes seemed to have scrambled the posts

[friendica.git] / include / feed.php

diff --git a/include/feed.php b/include/feed.php
index e66f279a9ba742e264b4f5e94cb437eba2fda98a..d7bbb24cbfcd5a6bcb35222defcfe5713eb37276 100644 (file)
--- a/include/feed.php
+++ b/include/feed.php
@@ -203,8 +203,8 @@ function feed_import($xml,$importer,&$contact, &$hub) {
 
                //$item["object"] = $xml;
 
-               $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` = '%s'",
-                       intval($importer["uid"]), dbesc($item["uri"]), dbesc(NETWORK_FEED));
+               $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 ($r) {
                        logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG);
                        continue;