mirror
/
friendica
kopia lustrzana https://github.com/friendica/friendica
1
0
Forkuj 1
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Improved loop detection

pull/5951/head
Michael 2018-10-18 03:33:08 +00:00
rodzic 35da40c2cb
commit 92816dc725
1 zmienionych plików z 4 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
src/Model/Contact.php
Wyświetl plik

@ -1021,10 +1021,11 @@ class Contact extends BaseObject
* @param integer $uid The user id for the contact (0 = public contact) * @param integer $uid The user id for the contact (0 = public contact)
* @param boolean $no_update Don't update the contact * @param boolean $no_update Don't update the contact
* @param array $default Default value for creating the contact when every else fails * @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 * @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); 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) { if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url) && !$in_loop) {
$contact_id = self::getIdForURL($data["alias"], $uid, true); $contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true);
} }
$url = $data["url"]; $url = $data["url"];