Merge pull request #7759 from nupplaphil/task/mod_receive

Move mod/receive to src/Module/Diaspora/receive

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 0e9acf5670604bfd3c35809099d28cd79c49fc26..21225cb23c0addcb7f3c8b9d89e4875e4529ab57 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -126,7 +126,7 @@ class GContact
                        throw new Exception('URL is empty');
                }
 
-               $gcontact['server_url'] = defaults($gcontact, 'server_url', '');
+               $gcontact['server_url'] = $gcontact['server_url'] ?? '';
 
                $urlparts = parse_url($gcontact['url']);
                if (empty($urlparts['scheme'])) {