Don't show deleted contacts, changed "pending" behaviour

This commit is contained in:
Michael 2019-01-12 13:28:14 +00:00
parent cd3ab5ddc9
commit 28f14c7d60
6 changed files with 23 additions and 16 deletions

View file

@ -358,6 +358,7 @@ class Contact extends BaseObject
WHERE `gid` = ?
AND `contact`.`uid` = ?
AND NOT `contact`.`self`
AND NOT `contact`.`deleted`
AND NOT `contact`.`blocked`
AND NOT `contact`.`pending`
ORDER BY `contact`.`name` ASC',
@ -1030,6 +1031,7 @@ class Contact extends BaseObject
FROM `contact`
WHERE `uid` = %d
AND NOT `self`
AND NOT `deleted`
AND NOT `blocked`
AND NOT `pending`
AND `id` NOT IN (