diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-08-12 22:45:32 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-08-12 22:45:32 +0200 |
| commit | 9da1439a4d71f925dcdfabc7882e71a17fe487ba (patch) | |
| tree | 3cb1d9d1dda92b9b228115460e5dfd6c8e93f0f6 | |
| parent | 4848dc5ec8f943348f5263632ea24990fdef6a77 (diff) | |
| parent | 998bd585bb75daf8b70071f21c5245bf24d46aa1 (diff) | |
| download | volse-hubzilla-9da1439a4d71f925dcdfabc7882e71a17fe487ba.tar.gz volse-hubzilla-9da1439a4d71f925dcdfabc7882e71a17fe487ba.tar.bz2 volse-hubzilla-9da1439a4d71f925dcdfabc7882e71a17fe487ba.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | include/follow.php | 7 |
1 files changed, 5 insertions, 2 deletions
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; } } |