Merge pull request #10470 from annando/local-publish-search

Allow search for only locally published contacts
This commit is contained in:
Hypolite Petovan 2021-07-04 19:42:55 -04:00 committed by GitHub
commit 9126c2c454
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 239 additions and 238 deletions

View File

@ -2989,7 +2989,8 @@ class Contact
$search .= '%';
$results = DBA::p("SELECT * FROM `contact`
WHERE NOT `unsearchable` AND `network` IN (?, ?, ?, ?) AND
WHERE (NOT `unsearchable` OR `nurl` IN (SELECT `nurl` FROM `owner-view` where `publish` OR `net-publish`))
AND `network` IN (?, ?, ?, ?) AND
NOT `failed` AND `uid` = ? AND
(`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?) $extra_sql
ORDER BY `nurl` DESC LIMIT 1000",

File diff suppressed because it is too large Load Diff