From 971e7321c65a8cb424fac3de34af9176275aac17 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 26 Mar 2016 14:33:36 -0700 Subject: issue #319 part 2 --- include/network.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'include/network.php') diff --git a/include/network.php b/include/network.php index e7d341321..33b62039c 100644 --- a/include/network.php +++ b/include/network.php @@ -1144,21 +1144,23 @@ function discover_by_webbie($webbie) { $avatar = ''; $pubkey = ''; - if(array_key_exists('address',$x)) - $address = $x['address']; - if(array_key_exists('location',$x)) - $location = $x['location']; - if(array_key_exists('nickname',$x)) - $nickname = $x['nickname']; + if(is_array($x)) { + if(array_key_exists('address',$x)) + $address = $x['address']; + if(array_key_exists('location',$x)) + $location = $x['location']; + if(array_key_exists('nickname',$x)) + $nickname = $x['nickname']; + } if(! $x) $probe_old = true; if($probe_old) { - $x = old_webfinger($webbie); - if($x) { + $y = old_webfinger($webbie); + if($y) { logger('old_webfinger: ' . print_r($x,true)); - foreach($x as $link) { + foreach($y as $link) { if($link['@attributes']['rel'] === NAMESPACE_DFRN) $dfrn = unamp($link['@attributes']['href']); if($link['@attributes']['rel'] === 'salmon') -- cgit v1.2.3