MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4525 from annando/fix-dfrn-delee

Browse source 
Bugfix: Deleting comments via DFRN had only partly worked
This commit is contained in:
Hypolite Petovan 2018-03-01 16:58:35 -05:00 committed by GitHub
parent e54a7e7834 0cc121cf44
commit 01c7945b7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Protocol/DFRN.php
View file

@ -2737,14 +2737,28 @@ class DFRN
return false; return false;
} }
$condition = ["`uri` = ? AND `uid` = ? AND `contact-id` = ? AND NOT `file` LIKE '%[%'", $condition = ["`uri` = ? AND `uid` = ? AND NOT `file` LIKE '%[%'", $uri, $importer["uid"]];
$uri, $importer["uid"], $importer["id"]]; $item = dba::selectFirst('item', ['id', 'parent', 'contact-id'], $condition);
$item = dba::selectFirst('item', ['id'], $condition);
if (!DBM::is_result($item)) { if (!DBM::is_result($item)) {
logger("Item with uri " . $uri . " from contact " . $importer["id"] . " for user " . $importer["uid"] . " wasn't found.", LOGGER_DEBUG); logger("Item with uri " . $uri . " for user " . $importer["uid"] . " wasn't found.", LOGGER_DEBUG);
return; return;
} }
// When it is a starting post it has to belong to the person that wants to delete it
if (($item['id'] == $item['parent']) && ($item['contact-id'] != $importer["id"])) {
logger("Item with uri " . $uri . " don't belong to contact " . $importer["id"] . " - ignoring deletion.", LOGGER_DEBUG);
return;
}
// Comments can be deleted by the thread owner or comment owner
if (($item['id'] != $item['parent']) && ($item['contact-id'] != $importer["id"])) {
$condition = ['id' => $item['parent'], 'contact-id' => $importer["id"]];
if (!dba::exists('item', $condition)) {
logger("Item with uri " . $uri . " wasn't found or mustn't be deleted by contact " . $importer["id"] . " - ignoring deletion.", LOGGER_DEBUG);
return;
}
}
$entrytype = self::getEntryType($importer, $item); $entrytype = self::getEntryType($importer, $item);
if (!$item["deleted"]) { if (!$item["deleted"]) {