diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2017-10-24 06:03:09 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2017-10-24 06:03:09 +0200 |
| commit | c99962106d6f9a65f01c2be4a9708d35dec7ca90 (patch) | |
| tree | b8c9439eaa107f03aae314146a21340e9e47d2b5 /include/zot.php | |
| parent | f648809856b852d3819a8c1a0d624fd725ed8a34 (diff) | |
| parent | e67ff5c122087f878111ad99d1c3b2328b967ab2 (diff) | |
| download | volse-hubzilla-c99962106d6f9a65f01c2be4a9708d35dec7ca90.tar.gz volse-hubzilla-c99962106d6f9a65f01c2be4a9708d35dec7ca90.tar.bz2 volse-hubzilla-c99962106d6f9a65f01c2be4a9708d35dec7ca90.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/zot.php b/include/zot.php index 55632fc31..dad30dbb0 100644 --- a/include/zot.php +++ b/include/zot.php @@ -361,8 +361,6 @@ function zot_refresh($them, $channel = null, $force = false) { else $permissions = $j['permissions']; - $connected_set = false; - if($permissions && is_array($permissions)) { $old_read_stream_perm = get_abconfig($channel['channel_id'],$x['hash'],'their_perms','view_stream'); @@ -4177,7 +4175,7 @@ function zotinfo($arr) { if($ztarget_hash) { $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), intval($e['channel_id']) ); @@ -4201,7 +4199,7 @@ function zotinfo($arr) { if($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); |