clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5951 from annando/endless-contact 

Avoid endless loop when trying to fetch contact id
This commit is contained in:
Hypolite Petovan 2018-10-18 00:44:07 -04:00 committed by GitHub
parent 6d420dfe9e 92816dc725
commit da2a17495d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Model/Contact.php
View File

@ -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)) {
$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"];