Only fetch the gsid when it had been empty before

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 5112f3dd6c97ba45870c70a19595bef87715c7be..73b6143b48cd5a4445840cb7d0e65b4f5978ba8c 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -291,8 +291,10 @@ class APContact
                        $apcontact['baseurl'] = null;
                }
 
-               if (!empty($apcontact['baseurl'])) {
+               if (!empty($apcontact['baseurl']) && empty($fetched_contact['gsid'])) {
                        $apcontact['gsid'] = GServer::getID($apcontact['baseurl']);
+               } elseif (!empty($fetched_contact['gsid'])) {
+                       $apcontact['gsid'] = $fetched_contact['gsid'];
                }
 
                if ($apcontact['url'] == $apcontact['alias']) {