Fix fatal errors caused by PR 8019

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 0ac05ccdf8e8dc2a97470be0f4018012ca87f428..a95b7e6ba0de9203f2bb36393bc0a5f8be7975c9 100644 (file)
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -80,7 +80,7 @@ class Magic extends BaseModule
                                $headers = HTTPSignature::createSig(
                                        $headers,
                                        $user['prvkey'],
-                                       'acct:' . $user['nickname'] . '@' . DI::baseUrl()->getHostname()() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : '')
+                                       'acct:' . $user['nickname'] . '@' . DI::baseUrl()->getHostname() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : '')
                                );
 
                                // Try to get an authentication token from the other instance.

diff --git a/src/Module/OpenSearch.php b/src/Module/OpenSearch.php
index e1da6741841190dcb9ad71e0e1d3442c3a8cb197..044c2b12788af279883c0c8788e05d52b421e629 100644 (file)
--- a/src/Module/OpenSearch.php
+++ b/src/Module/OpenSearch.php
@@ -21,7 +21,7 @@ class OpenSearch extends BaseModule
        {
                header('Content-type: application/opensearchdescription+xml');
 
-               $hostname = DI::baseUrl()->getHostname()();
+               $hostname = DI::baseUrl()->getHostname();
                $baseUrl  = DI::baseUrl()->get();
 
                /** @var DOMDocument $xml */

diff --git a/src/Module/Register.php b/src/Module/Register.php
index 613b3da7b5792528ca72fc3b2c9ef8e291575d9d..4bf9e5edd2840470770febb11702a9e85710d064 100644 (file)
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -132,7 +132,7 @@ class Register extends BaseModule
                        '$username'     => $username,
                        '$email'        => $email,
                        '$nickname'     => $nickname,
-                       '$sitename'     => DI::baseUrl()->getHostname()(),
+                       '$sitename'     => DI::baseUrl()->getHostname(),
                        '$importh'      => L10n::t('Import'),
                        '$importt'      => L10n::t('Import your profile to this friendica instance'),
                        '$showtoslink'  => Config::get('system', 'tosdisplay'),

diff --git a/src/Module/WellKnown/HostMeta.php b/src/Module/WellKnown/HostMeta.php
index 2bae006a7081f7fcff95ee439269d3eca4be89af..8781169635b613a8a72c4e4b7c2e67418d3c2d6e 100644 (file)
--- a/src/Module/WellKnown/HostMeta.php
+++ b/src/Module/WellKnown/HostMeta.php
@@ -29,7 +29,7 @@ class HostMeta extends BaseModule
 
                $tpl = Renderer::getMarkupTemplate('xrd_host.tpl');
                echo Renderer::replaceMacros($tpl, [
-                       '$zhost'  => DI::baseUrl()->getHostname()(),
+                       '$zhost'  => DI::baseUrl()->getHostname(),
                        '$zroot'  => DI::baseUrl()->get(),
                        '$domain' => DI::baseUrl()->get(),
                        '$bigkey' => Salmon::salmonKey($config->get('system', 'site_pubkey'))

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index c30e08f7be3152801f7af806d41f6cb7af0ff8ce..acdd168ed40a890ba5a04abdf4d0e3ff912d8091 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -466,7 +466,7 @@ class Feed {
                                // Distributed items should have a well formatted URI.
                                // Additionally we have to avoid conflicts with identical URI between imported feeds and these items.
                                if ($notify) {
-                                       $item['guid'] = Item::guidFromUri($orig_plink, DI::baseUrl()->getHostname()());
+                                       $item['guid'] = Item::guidFromUri($orig_plink, DI::baseUrl()->getHostname());
                                        unset($item['uri']);
                                        unset($item['parent-uri']);
 

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index f1cfa54c0f400dc12187b54b7ce08c69a2f7c97a..bd045c0200564bef4b3712b0e4881c00b159929f 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -1847,7 +1847,7 @@ class OStatus
                }
 
                $item["uri"] = $item['parent-uri'] = $item['thr-parent']
-                               = 'tag:' . DI::baseUrl()->getHostname()().
+                               = 'tag:' . DI::baseUrl()->getHostname().
                                ','.date('Y-m-d').':'.$action.':'.$owner['uid'].
                                ':person:'.$connect_id.':'.$item['created'];