friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fix fatal errors caused by PR 8019

This commit is contained in:
Michael 2019-12-30 01:17:16 +00:00
parent 03038e7a3b
commit 74f4637ff3
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Module/Magic.php
View File

@ -80,7 +80,7 @@ class Magic extends BaseModule
$headers = HTTPSignature::createSig( $headers = HTTPSignature::createSig(
$headers, $headers,
$user['prvkey'], $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. // Try to get an authentication token from the other instance.

2
src/Module/OpenSearch.php
View File

@ -21,7 +21,7 @@ class OpenSearch extends BaseModule
{ {
header('Content-type: application/opensearchdescription+xml'); header('Content-type: application/opensearchdescription+xml');
$hostname = DI::baseUrl()->getHostname()(); $hostname = DI::baseUrl()->getHostname();
$baseUrl = DI::baseUrl()->get(); $baseUrl = DI::baseUrl()->get();
/** @var DOMDocument $xml */ /** @var DOMDocument $xml */

2
src/Module/Register.php
View File

@ -132,7 +132,7 @@ class Register extends BaseModule
'$username' => $username, '$username' => $username,
'$email' => $email, '$email' => $email,
'$nickname' => $nickname, '$nickname' => $nickname,
'$sitename' => DI::baseUrl()->getHostname()(), '$sitename' => DI::baseUrl()->getHostname(),
'$importh' => L10n::t('Import'), '$importh' => L10n::t('Import'),
'$importt' => L10n::t('Import your profile to this friendica instance'), '$importt' => L10n::t('Import your profile to this friendica instance'),
'$showtoslink' => Config::get('system', 'tosdisplay'), '$showtoslink' => Config::get('system', 'tosdisplay'),

2
src/Module/WellKnown/HostMeta.php
View File

@ -29,7 +29,7 @@ class HostMeta extends BaseModule
$tpl = Renderer::getMarkupTemplate('xrd_host.tpl'); $tpl = Renderer::getMarkupTemplate('xrd_host.tpl');
echo Renderer::replaceMacros($tpl, [ echo Renderer::replaceMacros($tpl, [
'$zhost' => DI::baseUrl()->getHostname()(), '$zhost' => DI::baseUrl()->getHostname(),
'$zroot' => DI::baseUrl()->get(), '$zroot' => DI::baseUrl()->get(),
'$domain' => DI::baseUrl()->get(), '$domain' => DI::baseUrl()->get(),
'$bigkey' => Salmon::salmonKey($config->get('system', 'site_pubkey')) '$bigkey' => Salmon::salmonKey($config->get('system', 'site_pubkey'))

2
src/Protocol/Feed.php
View File

@ -466,7 +466,7 @@ class Feed {
// Distributed items should have a well formatted URI. // Distributed items should have a well formatted URI.
// Additionally we have to avoid conflicts with identical URI between imported feeds and these items. // Additionally we have to avoid conflicts with identical URI between imported feeds and these items.
if ($notify) { 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['uri']);
unset($item['parent-uri']); unset($item['parent-uri']);

2
src/Protocol/OStatus.php
View File

@ -1847,7 +1847,7 @@ class OStatus
} }
$item["uri"] = $item['parent-uri'] = $item['thr-parent'] $item["uri"] = $item['parent-uri'] = $item['thr-parent']
= 'tag:' . DI::baseUrl()->getHostname()(). = 'tag:' . DI::baseUrl()->getHostname().
','.date('Y-m-d').':'.$action.':'.$owner['uid']. ','.date('Y-m-d').':'.$action.':'.$owner['uid'].
':person:'.$connect_id.':'.$item['created']; ':person:'.$connect_id.':'.$item['created'];