Merge pull request #12364 from MrPetovan/bug/warnings

[friendica.git] / src / Model / Contact.php

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index d3ff4a2ef11086e6f2e5317951ee53cafc2beddf..c20435278f9d8973e5ccd53be9b425cb3ae38b72 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -2107,7 +2107,7 @@ class Contact
                if ($static) {
                        $query_params['static'] = true;
                }
-               
+
                return $url . ($guid ?: $cid) . (!empty($query_params) ? '?' . http_build_query($query_params) : '');
        }
 
@@ -2691,7 +2691,7 @@ class Contact
                }
 
                $update = false;
-               $guid = ($ret['guid'] ?? '') ?: Item::guidFromUri($ret['url'], parse_url($ret['url'], PHP_URL_HOST));
+               $guid = ($ret['guid'] ?? '') ?: Item::guidFromUri($ret['url']);
 
                // make sure to not overwrite existing values with blank entries except some technical fields
                $keep = ['batch', 'notify', 'poll', 'request', 'confirm', 'poco', 'baseurl'];