friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #3444 from annando/1705-mail-duplicates 

Mails shouldn't be duplicated anymore when sending
This commit is contained in:
Hypolite Petovan 2017-05-07 13:45:34 -04:00 committed by GitHub
parent fa3fa42d96 824141d3e5
commit 1c38540f20
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/diaspora.php
View File

@ -1517,8 +1517,9 @@ class Diaspora {
$person = self::person_by_handle($msg_author);
$r = q("SELECT `id` FROM `mail` WHERE `uri` = '%s' LIMIT 1",
dbesc($message_uri)
$r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
dbesc($msg_guid),
intval($importer["uid"])
);
if (dbm::is_result($r)) {
logger("duplicate message already delivered.", LOGGER_DEBUG);
@ -1814,8 +1815,8 @@ class Diaspora {
return false;
}
$r = q("SELECT `id` FROM `mail` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($message_uri),
$r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
dbesc($guid),
intval($importer["uid"])
);
if (dbm::is_result($r)) {