Account for the PUBLIC value for id parameter in Depository\PermissionSet::selectOneById

[friendica.git] / src / Model / Contact.php

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 93414d0ff9b29d2d7d16c6d343b00df8fe5248b8..f095543ebdd725f560d426f0f423191aed7674c8 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -3022,7 +3022,11 @@ class Contact
                        $networks[] = Protocol::OSTATUS;
                }
 
-               $condition = ['network' => $networks, 'failed' => false, 'uid' => $uid];
+               $condition = ['network' => $networks, 'failed' => false, 'deleted' => false, 'uid' => $uid];
+
+               if ($uid == 0) {
+                       $condition['blocked'] = false;
+               }
 
                // check if we search only communities or every contact
                if ($mode === 'community') {
@@ -3032,7 +3036,7 @@ class Contact
                $search .= '%';
 
                $condition = DBA::mergeConditions($condition,
-                       ["(NOT `unsearchable` OR `nurl` IN (SELECT `nurl` FROM `owner-view` where `publish` OR `net-publish`))
+                       ["(NOT `unsearchable` OR `nurl` IN (SELECT `nurl` FROM `owner-view` WHERE `publish` OR `net-publish`))
                        AND (`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?)", $search, $search, $search]);
 
                $contacts = self::selectToArray([], $condition);