sforkowany z mirror/friendica
Merge pull request #4525 from annando/fix-dfrn-delee
Bugfix: Deleting comments via DFRN had only partly worked2022.09-rc
commit
01c7945b7a
|
@ -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"]) {
|
||||||
|
|
Ładowanie…
Reference in New Issue