strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Only look for the GUID when checking for duplicates.

Browse source
This commit is contained in:
Michael Vogel 2015-09-06 07:34:51 +02:00
parent 988f32dfc8
commit c555b1b5cb
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/diaspora.php
View file

@ -845,9 +845,8 @@ function diaspora_post($importer,$xml,$msg) {
} }
$message_id = $diaspora_handle . ':' . $guid; $message_id = $diaspora_handle . ':' . $guid;
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `guid` = '%s' LIMIT 1", $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($importer['uid']), intval($importer['uid']),
dbesc($message_id),
dbesc($guid) dbesc($guid)
); );
if(count($r)) { if(count($r)) {
@ -964,9 +963,8 @@ function diaspora_store_by_guid($guid, $server, $uid = 0) {
$objecttype = $item["object-type"]; $objecttype = $item["object-type"];
$message_id = $author.':'.$guid; $message_id = $author.':'.$guid;
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `guid` = '%s' LIMIT 1", $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($uid), intval($uid),
dbesc($message_id),
dbesc($guid) dbesc($guid)
); );
if(count($r)) if(count($r))
@ -1134,9 +1132,8 @@ function diaspora_reshare($importer,$xml,$msg) {
} }
$message_id = $diaspora_handle . ':' . $guid; $message_id = $diaspora_handle . ':' . $guid;
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `guid` = '%s' LIMIT 1", $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($importer['uid']), intval($importer['uid']),
dbesc($message_id),
dbesc($guid) dbesc($guid)
); );
if(count($r)) { if(count($r)) {
@ -1320,9 +1317,8 @@ function diaspora_asphoto($importer,$xml,$msg) {
} }
$message_id = $diaspora_handle . ':' . $guid; $message_id = $diaspora_handle . ':' . $guid;
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `guid` = '%s' LIMIT 1", $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($importer['uid']), intval($importer['uid']),
dbesc($message_id),
dbesc($guid) dbesc($guid)
); );
if(count($r)) { if(count($r)) {