From a81011333fc113006fbf49b561915532f6cd2509 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 18 Apr 2018 19:41:09 -0700 Subject: follow activitypub by webfinger; requires addon update to all federation protocols --- include/follow.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/follow.php') diff --git a/include/follow.php b/include/follow.php index a63fe66ea..d803afa3f 100644 --- a/include/follow.php +++ b/include/follow.php @@ -150,9 +150,9 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) // attempt network auto-discovery - $d = discover_by_webbie($url,$protocol); + $wf = discover_by_webbie($url,$protocol); - if((! $d) && ($is_http)) { + if((! $wf) && ($is_http)) { // try RSS discovery @@ -167,9 +167,9 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) } } - if($d) { + if($wf || $d) { $r = q("select * from xchan where xchan_hash = '%s' or xchan_url = '%s' limit 1", - dbesc($url), + dbesc(($wf) ? $wf : $url), dbesc($url) ); } -- cgit v1.2.3