Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

2 files changed, 11 insertions, 4 deletions

diff --git a/include/channel.php b/include/channel.php
index d7116ce28..399dff87e 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -2604,3 +2604,12 @@ function anon_identity_init($reqvars) {
 }
 
 
+function pchan_to_chan($pchan) {
+	$chan = $pchan;
+	$chan['channel_address'] = $pchan['pchan_guid'];
+	$chan['channel_hash']    = $pchan['pchan_hash'];
+	$chan['channel_pubkey']  = $pchan['pchan_pubkey'];
+	$chan['channel_prvkey']  = $pchan['pchan_prvkey'];
+	$chan['channel_name']    = $pchan['xchan_name'];
+	return $chan;
+}
\ No newline at end of file
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);