Merge remote-tracking branch 'upstream/develop' into more-privacy

[friendica.git] / src / Module / WellKnown / HostMeta.php

diff --git a/src/Module/WellKnown/HostMeta.php b/src/Module/WellKnown/HostMeta.php
index fdebb05d71fa8b862b3d59482a20d042129355fa..eadc9f221a1a602a1178e32c33246a3c9dff5323 100644 (file)
--- a/src/Module/WellKnown/HostMeta.php
+++ b/src/Module/WellKnown/HostMeta.php
@@ -46,15 +46,14 @@ class HostMeta extends BaseModule
                        $config->set('system', 'site_pubkey', $res['pubkey']);
                }
 
-               $domain = DI::baseUrl()->get();
+               $domain = (string)DI::baseUrl();
 
-               $xml = null;
                XML::fromArray([
                        'XRD' => [
                                '@attributes' => [
                                        'xmlns'    => 'http://docs.oasis-open.org/ns/xri/xrd-1.0',
                                ],
-                               'hm:Host' => DI::baseUrl()->getHostname(),
+                               'hm:Host' => DI::baseUrl()->getHost(),
                                '1:link' => [
                                        '@attributes' => [
                                                'rel'      => 'lrdd',
@@ -81,13 +80,6 @@ class HostMeta extends BaseModule
                                                'href' => $domain . '/amcd'
                                        ]
                                ],
-                               '5:link' => [
-                                       '@attributes' => [
-                                               'rel'  => 'http://oexchange.org/spec/0.8/rel/resident-target',
-                                               'type' => 'application/xrd+xml',
-                                               'href' => $domain . '/oexchange/xrd'
-                                       ]
-                               ],
                                'Property' => [
                                        '@attributes' => [
                                                'type'      => 'http://salmon-protocol.org/ns/magic-key',