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

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

Browse Source
This commit is contained in:
friendica 2014-09-21 14:46:12 -07:00
parent 22e6e691ca
commit 09b5bbb032
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/follow.php
View File

@ -143,7 +143,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
if(! $r) { if(! $r) {
// attempt network auto-discovery // attempt network auto-discovery
if(strpos($url,'@')) { if(strpos($url,'@') && (! $is_http)) {
$r = discover_by_webbie($url); $r = discover_by_webbie($url);
} }
elseif($is_http) { elseif($is_http) {

1
include/items.php
View File

@ -1791,6 +1791,7 @@ function get_atom_elements($feed,$item,&$author) {
call_hooks('parse_atom', $arr); call_hooks('parse_atom', $arr);
logger('get_atom_elements: author: ' . print_r($author,true),LOGGER_DATA); logger('get_atom_elements: author: ' . print_r($author,true),LOGGER_DATA);
logger('get_atom_elements: ' . print_r($res,true),LOGGER_DATA); logger('get_atom_elements: ' . print_r($res,true),LOGGER_DATA);
return $res; return $res;

2
version.inc
View File

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