mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #7430 from annando/contact-not-archived

Browse source 
"all contacts" shouldn't show archived contacts
This commit is contained in:
Hypolite Petovan 2019-07-24 16:00:41 -04:00 committed by GitHub
commit d75e3e1650
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Module/Contact.php
View file

@ -668,19 +668,19 @@ class Contact extends BaseModule
switch ($type) { switch ($type) {
case 'blocked': case 'blocked':
$sql_extra = " AND `blocked` = 1"; $sql_extra = " AND `blocked`";
break; break;
case 'hidden': case 'hidden':
$sql_extra = " AND `hidden` = 1 AND `blocked` = 0"; $sql_extra = " AND `hidden` AND NOT `blocked`";
break; break;
case 'ignored': case 'ignored':
$sql_extra = " AND `readonly` = 1 AND `blocked` = 0"; $sql_extra = " AND `readonly` AND NOT `blocked`";
break; break;
case 'archived': case 'archived':
$sql_extra = " AND `archive` = 1 AND `blocked` = 0"; $sql_extra = " AND `archive` AND NOT `blocked`";
break; break;
default: default:
$sql_extra = " AND `blocked` = 0"; $sql_extra = " AND NOT `archive` AND NOT `blocked`";
} }
$sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM); $sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM);