Merge branch 'dev' into 'dev'

perform zot6 discovery in import_author_xchan

See merge request hubzilla/core!1550
This commit is contained in:
Mario 2019-03-12 13:40:04 +01:00
commit c33ef01af8

View File

@ -914,6 +914,15 @@ function import_author_xchan($x) {
if(array_key_exists('network',$x) && $x['network'] === 'zot')
return $y;
// perform zot6 discovery
if($x['url']) {
$y = discover_by_webbie($x['url'],'zot6');
if($y) {
return $y;
}
}
if($x['network'] === 'rss') {
$y = import_author_rss($x);
}