Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-19 00:23:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Michael 2021-07-05 03:03:41 +00:00
commit b09f555f4f
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 .= '%';
$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",

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

File diff suppressed because it is too large Load diff