aboutsummaryrefslogtreecommitdiffstats
path: root/include/follow.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-21 14:46:12 -0700
committerfriendica <info@friendica.com>2014-09-21 14:46:12 -0700
commit09b5bbb032116f9d984f557cdf43aa23fb65650a (patch)
tree3c9404e0a6e9b1f4239fa9ef14e36b417e4f70e5 /include/follow.php
parent22e6e691ca46a49db65a304dc2133b7ee15febc4 (diff)
downloadvolse-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
Diffstat (limited to 'include/follow.php')
-rw-r--r--include/follow.php2
1 files changed, 1 insertions, 1 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) {