Bugfix: You wasn't able to add an OStatus contact when you are follow…

…ing the same contact via Statusnet connector.
friendica · May 31, 2015 · fae3592 · fae3592
1 parent 2856042
commit fae3592
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/mod/follow.php b/mod/follow.php
@@ -14,8 +14,11 @@ function follow_content(&$a) {
 	$uid = local_user();
 	$url = notags(trim($_REQUEST['url']));
 
-	$r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND (`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s') LIMIT 1",
-		intval(local_user()), dbesc(normalise_link($url)), dbesc(normalise_link($url)), dbesc($url));
+	$r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND
+		(`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s') AND
+		`network` != '%s' LIMIT 1",
+		intval(local_user()), dbesc(normalise_link($url)),
+		dbesc(normalise_link($url)), dbesc($url), dbesc(NETWORK_STATUSNET));
 
 	if ($r) {
 		notice(t('You already added this contact.').EOL);