extened the earlier fix
This commit is contained in:
parent
42d26f01d6
commit
bab73edcef
@ -1967,13 +1967,13 @@ function xchan_query(&$items,$abook = true,$effective_uid = 0) {
|
|||||||
if(count($arr)) {
|
if(count($arr)) {
|
||||||
if($abook) {
|
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
|
$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 (" . implode(',', $arr) . ") and hubloc_primary = 1",
|
where xchan_hash in (" . protect_sprintf(implode(',', $arr)) . ") and hubloc_primary = 1",
|
||||||
intval($item['uid'])
|
intval($item['uid'])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$chans = q("select xchan.*,hubloc.* from xchan left join hubloc on hubloc_hash = xchan_hash
|
$chans = q("select xchan.*,hubloc.* from xchan left join hubloc on hubloc_hash = xchan_hash
|
||||||
where xchan_hash in (" . implode(',', $arr) . ") and hubloc_primary = 1");
|
where xchan_hash in (" . protect_sprintf(implode(',', $arr)) . ") and hubloc_primary = 1");
|
||||||
}
|
}
|
||||||
$xchans = q("select * from xchan where xchan_hash in (" . protect_sprintf(implode(',',$arr)) . ") and xchan_network in ('rss','unknown')");
|
$xchans = q("select * from xchan where xchan_hash in (" . protect_sprintf(implode(',',$arr)) . ") and xchan_network in ('rss','unknown')");
|
||||||
if(! $chans)
|
if(! $chans)
|
||||||
|
Reference in New Issue
Block a user