From 9cdecd8ec86ea872cad8c1ffbd8614b3a1d61a73 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 9 Oct 2016 10:47:47 +0000 Subject: [PATCH] webfinger_dfrn now work as expected --- include/Probe.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/Probe.php b/include/Probe.php index d8814036d9..a245ef250f 100644 --- a/include/Probe.php +++ b/include/Probe.php @@ -118,18 +118,16 @@ class Probe { */ public static function webfinger_dfrn($webbie, &$hcard) { - if (!strstr($webbie, '@')) - return $webbie; $profile_link = ''; - $links = self::webfinger($webbie); + $links = self::lrdd($webbie); logger('webfinger_dfrn: '.$webbie.':'.print_r($links,true), LOGGER_DATA); if (count($links)) { foreach ($links as $link) { if ($link['@attributes']['rel'] === NAMESPACE_DFRN) $profile_link = $link['@attributes']['href']; - if ($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) + if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) AND ($profile_link == "")) $profile_link = 'stat:'.$link['@attributes']['template']; if ($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard') $hcard = $link['@attributes']['href'];