harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue #319 part 2

Browse Source
This commit is contained in:
redmatrix
2016-03-26 14:33:36 -07:00
parent 92ec46b62e
commit 971e7321c6
3 changed files with 159 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/network.php
View File

@@ -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')