Remove probing in magic link construction

- Use Contact::getProbeDataFromDatabase and Contact::magicLinkByContact instead of Contact::getIdForURL and Contact::magicLinkbyId in Contact::magicLink
- Add default value for $cid parameter in Contact::getProbeDataFromDatabase

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 85d1bfe9adf0634ba313e9d02022f43ed1a8a9dd..24c2bf878c82e326fb288a17dba393cb2a6de4cd 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1127,7 +1127,7 @@ class Contact extends BaseObject
         *
         * @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
                $ssl_url = str_replace('http://', 'https://', $url);
@@ -2249,12 +2249,12 @@ class Contact extends BaseObject
                        return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
                }
 
-               $cid = self::getIdForURL($contact_url, 0, true);
-               if (empty($cid)) {
+               $data = self::getProbeDataFromDatabase($contact_url);
+               if (empty($data)) {
                        return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
                }
 
-               return self::magicLinkbyId($cid, $url);
+               return self::magicLinkByContact($data, $contact_url);
        }
 
        /**