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

include/follow.php

@@ -266,9 +266,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 		}
 	}
 	else {
-		$closeness = get_pconfig($uid,'system','new_abook_closeness');
-		if($closeness === false)
-			$closeness = 80;
+		$closeness = get_pconfig($uid,'system','new_abook_closeness',80);
 
 		$r = abook_store_lowlevel(
 			[

include/zot.php

@@ -1232,6 +1232,7 @@ function zot_fetch($arr) {
 			$datatosend = json_encode(crypto_encapsulate(json_encode($data),$hub['hubloc_sitekey'], $algorithm));
 
 			$import = zot_zot($url,$datatosend);
+
 		}
 		else {
 			$algorithm = zot_best_algorithm($hub['site_crypto']);
@@ -4913,6 +4914,7 @@ function zot_reply_pickup($data) {
 		dbesc($data['secret']),
 		dbesc($data['callback'])
 	);
+
 	if(! $r) {
 		$ret['message'] = 'nothing to pick up';
 		logger('mod_zot: pickup: ' . $ret['message']);