diff options
| author | friendica <info@friendica.com> | 2014-09-21 14:46:12 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-21 14:46:12 -0700 |
| commit | 09b5bbb032116f9d984f557cdf43aa23fb65650a (patch) | |
| tree | 3c9404e0a6e9b1f4239fa9ef14e36b417e4f70e5 | |
| parent | 22e6e691ca46a49db65a304dc2133b7ee15febc4 (diff) | |
| download | volse-hubzilla-09b5bbb032116f9d984f557cdf43aa23fb65650a.tar.gz volse-hubzilla-09b5bbb032116f9d984f557cdf43aa23fb65650a.tar.bz2 volse-hubzilla-09b5bbb032116f9d984f557cdf43aa23fb65650a.zip | |
feeds with '@' in the URL were being handled as webfinger addresses and didn't fall through to RSS discovery. Issue #599
| -rw-r--r-- | include/follow.php | 2 | ||||
| -rwxr-xr-x | include/items.php | 1 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 3 insertions, 2 deletions
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; diff --git a/version.inc b/version.inc index 5a8480353..3e346cf06 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-20.804 +2014-09-21.805 |