"all" contacts shouldn't show archived contacts
This commit is contained in:
parent
9ba7f4689a
commit
aac086bf91
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue