Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 09:15:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse source 
Conflicts:
	include/zot.php
This commit is contained in:
redmatrix 2015-09-20 16:55:24 -07:00
commit b240c15014
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/zot.php
View file

@ -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
$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']),
intval($channel['channel_id'])
);