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

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2017-08-12 22:45:32 +02:00
commit 9da1439a4d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/follow.php
View File

@ -138,6 +138,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
); );
if(! $r) { if(! $r) {
// attempt network auto-discovery // attempt network auto-discovery
$d = discover_by_webbie($url,$protocol); $d = discover_by_webbie($url,$protocol);
@ -146,11 +147,13 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
// try RSS discovery // 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); $d = discover_by_url($url);
} }
else { else {
$result['message'] = t('Protocol disabled.'); $result['message'] = t('Remote channel or protocol unavailable.');
return $result; return $result;
} }
} }