Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-05 21:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/2018.08-rc' into ap1

Browse source
This commit is contained in:
Michael 2018-09-15 20:49:46 +00:00
commit e45206ae5d
17 changed files with 81 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Worker/RemoveContact.php
View file

@ -13,8 +13,8 @@ require_once 'include/dba.php';
class RemoveContact {
public static function execute($id) {
// Only delete if the contact is archived
$condition = ['archive' => true, 'network' => Protocol::PHANTOM, 'id' => $id];
// Only delete if the contact is to be deleted
$condition = ['network' => Protocol::PHANTOM, 'id' => $id];
$r = DBA::exists('contact', $condition);
if (!DBA::isResult($r)) {
return;