feeds with '@' in the URL were being handled as webfinger addresses and didn't fall through to RSS discovery. Issue #599

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) {

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;

version.inc

@@ -1 +1 @@
-2014-09-20.804
+2014-09-21.805