From 92816dc7258d47df6bff3c1575af08aa5708454b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 18 Oct 2018 03:33:08 +0000
Subject: [PATCH] Improved loop detection

---
 src/Model/Contact.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 24e9be042..472875a80 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1021,10 +1021,11 @@ class Contact extends BaseObject
 	 * @param integer $uid       The user id for the contact (0 = public contact)
 	 * @param boolean $no_update Don't update the contact
 	 * @param array   $default   Default value for creating the contact when every else fails
+	 * @param boolean $in_loop   Internally used variable to prevent an endless loop
 	 *
 	 * @return integer Contact ID
 	 */
-	public static function getIdForURL($url, $uid = 0, $no_update = false, $default = [])
+	public static function getIdForURL($url, $uid = 0, $no_update = false, $default = [], $in_loop = false)
 	{
 		logger("Get contact data for url " . $url . " and user " . $uid . " - " . System::callstack(), LOGGER_DEBUG);
 
@@ -1138,8 +1139,8 @@ class Contact extends BaseObject
 			}
 		}
 
-		if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url) && !$no_update) {
-			$contact_id = self::getIdForURL($data["alias"], $uid, true);
+		if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url) && !$in_loop) {
+			$contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true);
 		}
 
 		$url = $data["url"];