Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: include/zot.php
This commit is contained in:
commit
b240c15014
@ -490,7 +490,7 @@ function zot_refresh($them, $channel = null, $force = false) {
|
|||||||
|
|
||||||
// Send a clone sync packet and a permissions update if permissions have changed
|
// Send a clone sync packet and a permissions update if permissions have changed
|
||||||
|
|
||||||
$new_connection = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 order by abook_created desc limit 1",
|
$new_connection = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 order by abook_created desc limit 1",
|
||||||
dbesc($x['hash']),
|
dbesc($x['hash']),
|
||||||
intval($channel['channel_id'])
|
intval($channel['channel_id'])
|
||||||
);
|
);
|
||||||
|
Reference in New Issue
Block a user