From 998bd585bb75daf8b70071f21c5245bf24d46aa1 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 12 Aug 2017 00:59:05 -0700 Subject: add protocol selection to following feeds --- include/follow.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/follow.php b/include/follow.php index 130f8b06b..56d8294c5 100644 --- a/include/follow.php +++ b/include/follow.php @@ -138,6 +138,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) ); if(! $r) { + // attempt network auto-discovery $d = discover_by_webbie($url,$protocol); @@ -146,11 +147,13 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) // try RSS discovery - if(get_config('system','feed_contacts')) { + $feeds = get_config('system','feed_contacts'); + + if(($feeds) && ($protocol === '' || $protocol === 'feed')) { $d = discover_by_url($url); } else { - $result['message'] = t('Protocol disabled.'); + $result['message'] = t('Remote channel or protocol unavailable.'); return $result; } } -- cgit v1.2.3