diff options
| author | redmatrix <git@macgirvin.com> | 2016-03-26 14:33:36 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-03-26 14:33:36 -0700 |
| commit | 971e7321c65a8cb424fac3de34af9176275aac17 (patch) | |
| tree | 4b7bd0fc8e6e0eed1e709ea06b39276c10b8a8ba /include | |
| parent | 92ec46b62e98a1e90e822f490d49ebab06cec753 (diff) | |
| download | volse-hubzilla-971e7321c65a8cb424fac3de34af9176275aac17.tar.gz volse-hubzilla-971e7321c65a8cb424fac3de34af9176275aac17.tar.bz2 volse-hubzilla-971e7321c65a8cb424fac3de34af9176275aac17.zip | |
issue #319 part 2
Diffstat (limited to 'include')
| -rw-r--r-- | include/network.php | 20 |
1 files changed, 11 insertions, 9 deletions
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') |