aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-10-22 21:44:20 +0200
committerMario Vavti <mario@mariovavti.com>2017-10-22 21:44:20 +0200
commit189a15fe3765128e7154a3879a074c2077863000 (patch)
tree749450082aeac0cc36f307282ae7db142e37f232
parent0061ac8584feb6d18962518263ab18617dbf8dc5 (diff)
parentc7d9a5ac91b3d256f31ebada4b38875905addb1f (diff)
downloadvolse-hubzilla-189a15fe3765128e7154a3879a074c2077863000.tar.gz
volse-hubzilla-189a15fe3765128e7154a3879a074c2077863000.tar.bz2
volse-hubzilla-189a15fe3765128e7154a3879a074c2077863000.zip
Merge remote-tracking branch 'mike/master' into dev
-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);