clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
parent 968122337d dfc1b1e7a5
commit 9126c2c454
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 239 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Model/Contact.php
View File

@ -2989,7 +2989,8 @@ class Contact
$search .= '%'; $search .= '%';
$results = DBA::p("SELECT * FROM `contact` $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 NOT `failed` AND `uid` = ? AND
(`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?) $extra_sql (`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?) $extra_sql
ORDER BY `nurl` DESC LIMIT 1000", ORDER BY `nurl` DESC LIMIT 1000",

474
view/lang/C/messages.po
View File

File diff suppressed because it is too large Load Diff