Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

2 files changed, 8 insertions, 11 deletions

diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php
index efb380033..d24a31a15 100644
--- a/Zotlabs/Module/Wfinger.php
+++ b/Zotlabs/Module/Wfinger.php
@@ -163,13 +163,13 @@ class Wfinger extends \Zotlabs\Web\Controller {
 			else {
 
 				$result['links'] = [
-	
+
 					[
 						'rel'  => 'http://webfinger.net/rel/avatar',
 						'type' => $r[0]['xchan_photo_mimetype'],
 						'href' => $r[0]['xchan_photo_l']	
 					],
-	
+
 					[
 						'rel'  => 'http://microformats.org/profile/hcard',
 						'type' => 'text/html',
@@ -181,12 +181,11 @@ class Wfinger extends \Zotlabs\Web\Controller {
 						'href' => z_root()
 					],
 
-
 					[
 						'rel'  => 'http://webfinger.net/rel/profile-page',
 						'href' => z_root() . '/profile/' . $r[0]['channel_address'],
 					],
-	
+
 					[
 						'rel'  => 'http://schemas.google.com/g/2010#updates-from', 
 						'type' => 'application/atom+xml', 
@@ -197,7 +196,7 @@ class Wfinger extends \Zotlabs\Web\Controller {
 						'rel'  => 'http://webfinger.net/rel/blog',
 						'href' => z_root() . '/channel/' . $r[0]['channel_address'],
 					],
-	
+
 					[
 						'rel'      => 'http://ostatus.org/schema/1.0/subscribe',
 						'template' => z_root() . '/follow?f=&url={uri}',
@@ -220,7 +219,6 @@ class Wfinger extends \Zotlabs\Web\Controller {
 						'href' => z_root() . '/owa',
 					],
 
-	
 					[
 						'rel'  => 'magic-public-key',
 						'href' => 'data:application/magic-public-key,' . salmon_key($r[0]['channel_pubkey']),
@@ -242,7 +240,6 @@ class Wfinger extends \Zotlabs\Web\Controller {
 		$arr = [ 'channel' => $r[0], 'pchan' => $pchan, 'request' => $_REQUEST, 'result' => $result ];
 		call_hooks('webfinger',$arr);
 
-
 		json_return_and_die($arr['result'],'application/jrd+json');
 	
 	}
diff --git a/Zotlabs/Module/Zfinger.php b/Zotlabs/Module/Zfinger.php
index 0151d458a..533f0a5db 100644
--- a/Zotlabs/Module/Zfinger.php
+++ b/Zotlabs/Module/Zfinger.php
@@ -10,11 +10,11 @@ class Zfinger extends \Zotlabs\Web\Controller {
 	
 		require_once('include/zot.php');
 		require_once('include/crypto.php');
-	
-		$x = Libzot::zotinfo($_REQUEST);
 
-		if($x && $x['id'] && $x['public_key']) {
-			$chan_hash = Libzot::make_xchan_hash($x['id'],$x['public_key']);
+		$x = zotinfo($_REQUEST);
+
+		if($x && $x['guid'] && $x['guid_sig']) {
+			$chan_hash = make_xchan_hash($x['guid'],$x['guid_sig']);
 			if($chan_hash) {
 				$chan = channelx_by_hash($chan_hash);
 			}