Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-17 01:25:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Issue 5733: Removing contacts does work now on the same machine as well

Browse source
This commit is contained in:
Michael 2018-09-12 06:05:14 +00:00
parent dcb9bf4136
commit 96d10c25e3
4 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
mod/contacts.php
View file

@ -47,6 +47,11 @@ function contacts_init(App $a)
if (!DBA::isResult($contact)) {
$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => 0]);
}
// Don't display contacts that are about to be deleted
if (($contact['network'] == Protocol::PHANTOM)) {
$contact = false;
}
}
if (DBA::isResult($contact)) {
@ -719,6 +724,8 @@ function contacts_content(App $a, $update = 0)
$sql_extra = " AND `blocked` = 0 ";
}
$sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM);
$search = x($_GET, 'search') ? notags(trim($_GET['search'])) : '';
$nets = x($_GET, 'nets' ) ? notags(trim($_GET['nets'])) : '';