X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fredir.php;h=d8bb7643965963c7ebe195e04e564bcc22b4a947;hb=4011f244d6ca0f0e50241dfaae7aa6e0425e66fd;hp=3e8ddf26120a63558785f48eb5f68192a0dbb47f;hpb=0840c8365ae4aae1d56e75caf190dbd24c67958f;p=friendica.git

diff --git a/include/redir.php b/include/redir.php
index 3e8ddf2612..d8bb764396 100644
--- a/include/redir.php
+++ b/include/redir.php
@@ -4,7 +4,7 @@ function auto_redir(&$a, $contact_nick) {
 
 	// prevent looping
 
-	if(intval($_REQUEST,'redir'))
+	if(x($_REQUEST,'redir') && intval($_REQUEST['redir']))
 		return;
 
 	if((! $contact_nick) || ($contact_nick === $a->user['nickname']))
@@ -20,7 +20,7 @@ function auto_redir(&$a, $contact_nick) {
 		//
 		// We also have to make sure that I'm a legitimate contact--I'm not blocked or pending.
 
-		$baseurl = $a->get_baseurl();
+		$baseurl = App::get_baseurl();
 		$domain_st = strpos($baseurl, "://");
 		if($domain_st === false)
 			return;
@@ -36,9 +36,9 @@ function auto_redir(&$a, $contact_nick) {
                dbesc($nurl)
 		);
 
-		if((!$r) || (! count($r)) || $r[0]['id'] == remote_user())
+		if ((! dbm::is_result($r)) || $r[0]['id'] == remote_user()) {
 			return;
-
+		}
 
 		$r = q("SELECT * FROM contact WHERE nick = '%s'
 		        AND network = '%s' AND uid = %d  AND url LIKE '%%%s%%' LIMIT 1",
@@ -48,8 +48,9 @@ function auto_redir(&$a, $contact_nick) {
 		       dbesc($baseurl)
 		);
 
-		if(! ($r && count($r)))
+		if (! dbm::is_result($r)) {
 			return;
+		}
 
 		$cid = $r[0]['id'];