Merge remote-tracking branch 'upstream/develop' into notice

2021-07-05 03:03:41 +00:00 · 2021-07-05 03:03:41 +00:00 · b09f555f4f
commit b09f555f4f
parent 1b6d0f8b1f 9126c2c454
2 changed files with 239 additions and 238 deletions
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@ -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",
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po