friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #7000 from MrPetovan/task/6999-no-probe-magic-link 

Remove probing in magic link construction
This commit is contained in:
Philipp 2019-05-03 08:43:26 +02:00 committed by GitHub
parent 900fe158f5 49d12b5fae
commit c9cce8492e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Model/Contact.php
View File

@ -1163,7 +1163,7 @@ class Contact extends BaseObject
* *
* @return array Contact array in the "probe" structure * @return array Contact array in the "probe" structure
*/ */
private static function getProbeDataFromDatabase($url, $cid) private static function getProbeDataFromDatabase($url, $cid = null)
{ {
// The link could be provided as http although we stored it as https // The link could be provided as http although we stored it as https
$ssl_url = str_replace('http://', 'https://', $url); $ssl_url = str_replace('http://', 'https://', $url);
@ -2285,12 +2285,12 @@ class Contact extends BaseObject
return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url; return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
} }
$cid = self::getIdForURL($contact_url, 0, true); $data = self::getProbeDataFromDatabase($contact_url);
if (empty($cid)) { if (empty($data)) {
return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url; return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
} }
return self::magicLinkbyId($cid, $url); return self::magicLinkByContact($data, $contact_url);
} }
/** /**