diff options
| author | Mario Vavti <mario@mariovavti.com> | 2024-11-10 19:01:40 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2024-11-10 19:01:40 +0100 |
| commit | b24b409a018f145927d8c5b72797494a7a3e9d35 (patch) | |
| tree | ccc29e22f05571f449679c5b195d68352ae7ea34 /include/text.php | |
| parent | e52714ed167d8cd5c2091efc74b7eb6db1adc4ab (diff) | |
| parent | 3791dfab3a73e84a007e3d8f5cd6cc4bdb014de2 (diff) | |
| download | volse-hubzilla-b24b409a018f145927d8c5b72797494a7a3e9d35.tar.gz volse-hubzilla-b24b409a018f145927d8c5b72797494a7a3e9d35.tar.bz2 volse-hubzilla-b24b409a018f145927d8c5b72797494a7a3e9d35.zip | |
Merge branch 'dev' into containers
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php index e69ce7d10..18a70c3a5 100644 --- a/include/text.php +++ b/include/text.php @@ -2639,13 +2639,13 @@ function xchan_query(&$items, $abook = true, $effective_uid = 0) { if(count($arr)) { if($abook) { $chans = q("select * from xchan left join hubloc on hubloc_hash = xchan_hash left join abook on abook_xchan = xchan_hash and abook_channel = %d - where xchan_hash in (" . protect_sprintf(implode(',', $arr)) . ") and hubloc_deleted = 0 order by hubloc_primary desc", + where xchan_hash in (" . protect_sprintf(implode(',', $arr)) . ") order by hubloc_primary desc, hubloc_deleted ASC", intval($item['uid']) ); } else { $chans = q("select xchan.*,hubloc.* from xchan left join hubloc on hubloc_hash = xchan_hash - where xchan_hash in (" . protect_sprintf(implode(',', $arr)) . ") and hubloc_deleted = 0 order by hubloc_primary desc"); + where xchan_hash in (" . protect_sprintf(implode(',', $arr)) . ") order by hubloc_primary desc, hubloc_deleted ASC"); } $xchans = q("select * from xchan where xchan_hash in (" . protect_sprintf(implode(',',$arr)) . ") and xchan_network in ('rss','unknown', 'anon', 'token')"); if(! $chans) |