diff options
author | Mario <mario@mariovavti.com> | 2019-03-12 13:40:04 +0100 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2019-03-12 13:40:04 +0100 |
commit | c33ef01af84bb3c5db5bf078eb921a51a8e72ecc (patch) | |
tree | dfafbcc0774daafb5cbc66266b0f1f3da834bbb0 | |
parent | 9ed5cddb89c42f3314670f273ab1683a7e7526c9 (diff) | |
parent | 3ec06705caed8459045875d03b8906e72405d6bb (diff) | |
download | volse-hubzilla-c33ef01af84bb3c5db5bf078eb921a51a8e72ecc.tar.gz volse-hubzilla-c33ef01af84bb3c5db5bf078eb921a51a8e72ecc.tar.bz2 volse-hubzilla-c33ef01af84bb3c5db5bf078eb921a51a8e72ecc.zip |
Merge branch 'dev' into 'dev'
perform zot6 discovery in import_author_xchan
See merge request hubzilla/core!1550
-rwxr-xr-x | include/items.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php index 51aa81017..c6dcd32c6 100755 --- a/include/items.php +++ b/include/items.php @@ -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); } |