Merge pull request #2975 from annando/1611-frontend-worker

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index 83eab192702d6224bc013cd7c8350ae0dd8e8e44..63e583d69f8c539b8d1c3cd5c49f1fec6cb8928c 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -874,8 +874,8 @@ function contact_block() {
        if((! is_array($a->profile)) || ($a->profile['hide-friends']))
                return $o;
        $r = q("SELECT COUNT(*) AS `total` FROM `contact`
-                       WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0
-                               AND `hidden` = 0 AND `archive` = 0
+                       WHERE `uid` = %d AND NOT `self` AND NOT `blocked`
+                               AND NOT `hidden` AND NOT `archive`
                                AND `network` IN ('%s', '%s', '%s')",
                        intval($a->profile['uid']),
                        dbesc(NETWORK_DFRN),
@@ -892,7 +892,7 @@ function contact_block() {
        } else {
                // Splitting the query in two parts makes it much faster
                $r = q("SELECT `id` FROM `contact`
-                               WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending`
+                               WHERE `uid` = %d AND NOT `self` AND NOT `blocked`
                                        AND NOT `hidden` AND NOT `archive`
                                AND `network` IN ('%s', '%s', '%s') ORDER BY RAND() LIMIT %d",
                                intval($a->profile['uid']),