aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-10-22 12:35:17 -0700
committerzotlabs <mike@macgirvin.com>2017-10-22 12:35:17 -0700
commitc7d9a5ac91b3d256f31ebada4b38875905addb1f (patch)
treee0455231cb441570322b08bf1eb184880be33f22 /include
parent400441d56b21e69663ea7213ccf63fe0ee6a6bab (diff)
downloadvolse-hubzilla-c7d9a5ac91b3d256f31ebada4b38875905addb1f.tar.gz
volse-hubzilla-c7d9a5ac91b3d256f31ebada4b38875905addb1f.tar.bz2
volse-hubzilla-c7d9a5ac91b3d256f31ebada4b38875905addb1f.zip
wrong key
Diffstat (limited to 'include')
-rw-r--r--include/zot.php6
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);