From 09b5bbb032116f9d984f557cdf43aa23fb65650a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 21 Sep 2014 14:46:12 -0700 Subject: feeds with '@' in the URL were being handled as webfinger addresses and didn't fall through to RSS discovery. Issue #599 --- include/follow.php | 2 +- include/items.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/follow.php b/include/follow.php index 3c1fcd890..38525982e 100644 --- a/include/follow.php +++ b/include/follow.php @@ -143,7 +143,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) if(! $r) { // attempt network auto-discovery - if(strpos($url,'@')) { + if(strpos($url,'@') && (! $is_http)) { $r = discover_by_webbie($url); } elseif($is_http) { diff --git a/include/items.php b/include/items.php index 840c92982..53a0b25a9 100755 --- a/include/items.php +++ b/include/items.php @@ -1791,6 +1791,7 @@ function get_atom_elements($feed,$item,&$author) { call_hooks('parse_atom', $arr); logger('get_atom_elements: author: ' . print_r($author,true),LOGGER_DATA); + logger('get_atom_elements: ' . print_r($res,true),LOGGER_DATA); return $res; -- cgit v1.2.3