X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fredir.php;h=d29159ed0342c91a2c652932508a7ed90c8382dc;hb=df8b522f6b96bc3a631e608ee430555590e91f0c;hp=d8bb7643965963c7ebe195e04e564bcc22b4a947;hpb=4c04a78d1b6f14ce90e4ca0b23e356d234c4a296;p=friendica.git

diff --git a/include/redir.php b/include/redir.php
index d8bb764396..d29159ed03 100644
--- a/include/redir.php
+++ b/include/redir.php
@@ -27,13 +27,13 @@ function auto_redir(&$a, $contact_nick) {
 		$baseurl = substr($baseurl, $domain_st + 3);
 		$nurl = normalise_link($baseurl);
 
-
-		$r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 )
-		        AND nick = '%s' AND self = 0 AND ( url LIKE '%%%s%%' or nurl LIKE '%%%s%%' ) AND blocked = 0 AND pending = 0 LIMIT 1",
-			   dbesc($contact_nick),
-			   dbesc($a->user['nickname']),
-		       dbesc($baseurl),
-               dbesc($nurl)
+		/// @todo Why is there a query for "url" *and* "nurl"? Especially this normalising is strange.
+		$r = q("SELECT `id` FROM `contact` WHERE `uid` = (SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1)
+		        AND `nick` = '%s' AND NOT `self` AND (`url` LIKE '%%%s%%' OR `nurl` LIKE '%%%s%%') AND NOT `blocked` AND NOT `pending` LIMIT 1",
+				dbesc($contact_nick),
+				dbesc($a->user['nickname']),
+				dbesc($baseurl),
+				dbesc($nurl)
 		);
 
 		if ((! dbm::is_result($r)) || $r[0]['id'] == remote_user()) {