Commit 189a15fe authored by Mario's avatar Mario
Browse files

Merge remote-tracking branch 'mike/master' into dev

parents 0061ac85 c7d9a5ac
...@@ -361,8 +361,6 @@ function zot_refresh($them, $channel = null, $force = false) { ...@@ -361,8 +361,6 @@ function zot_refresh($them, $channel = null, $force = false) {
else else
$permissions = $j['permissions']; $permissions = $j['permissions'];
$connected_set = false;
if($permissions && is_array($permissions)) { if($permissions && is_array($permissions)) {
$old_read_stream_perm = get_abconfig($channel['channel_id'],$x['hash'],'their_perms','view_stream'); $old_read_stream_perm = get_abconfig($channel['channel_id'],$x['hash'],'their_perms','view_stream');
...@@ -4177,7 +4175,7 @@ function zotinfo($arr) { ...@@ -4177,7 +4175,7 @@ function zotinfo($arr) {
if($ztarget_hash) { if($ztarget_hash) {
$permissions['connected'] = false; $permissions['connected'] = false;
$b = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1", $b = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and abook_pending = 0 limit 1",
dbesc($ztarget_hash), dbesc($ztarget_hash),
intval($e['channel_id']) intval($e['channel_id'])
); );
...@@ -4201,7 +4199,7 @@ function zotinfo($arr) { ...@@ -4201,7 +4199,7 @@ function zotinfo($arr) {
if($x) if($x)
$ret['locations'] = $x; $ret['locations'] = $x;
$ret['site'] = zot_site_info($e['xchan_pubkey']); $ret['site'] = zot_site_info($e['channel_prvkey']);
check_zotinfo($e,$x,$ret); check_zotinfo($e,$x,$ret);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment