From b9a1e2e97f42c20414ed03b5c15e3ba47c2f16a2 Mon Sep 17 00:00:00 2001 From: miqrogroove Date: Wed, 20 Jun 2018 11:59:13 -0400 Subject: [PATCH] Need the count conditions to match. --- mod/directory.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index 04deecbede..a83b1b76ce 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -83,7 +83,7 @@ function directory_content(App $a) $cnt = dba::fetch_first("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` - WHERE `is-default` $publish AND NOT `user`.`blocked` $sql_extra"); + WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` $sql_extra"); if (DBM::is_result($cnt)) { $a->set_pager_total($cnt['total']); } @@ -96,7 +96,7 @@ function directory_content(App $a) `contact`.`addr`, `contact`.`url` AS profile_url FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid` - WHERE `is-default` $publish AND `user`.`blocked` = 0 AND `user`.`account_removed` = 0 AND `contact`.`self` + WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self` $sql_extra $order LIMIT $limit" ); if (DBM::is_result($r)) {