Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-23 11:50:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix: Force baseUrl being a string

Browse source
This commit is contained in:
Michael 2023-04-15 14:17:30 +00:00
parent 68d9e1f33c
commit b0f880d0eb
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Install.php
View file

@ -343,7 +343,7 @@ class Install extends BaseModule
*/
private function whatNext(): string
{
$baseurl = $this->baseUrl;
$baseurl = (string)$this->baseUrl;
return
$this->t('<h1>What next</h1>')
. "<p>" . $this->t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.')

2
src/Module/User/Import.php
View file

@ -232,7 +232,7 @@ class Import extends \Friendica\BaseModule
}
$oldBaseUrl = $account['baseurl'];
$newBaseUrl = $this->baseUrl;
$newBaseUrl = (string)$this->baseUrl;
$oldAddr = str_replace('http://', '@', Strings::normaliseLink($oldBaseUrl));
$newAddr = str_replace('http://', '@', Strings::normaliseLink($newBaseUrl));

6
src/Module/Xrd.php
View file

@ -105,7 +105,7 @@ class Xrd extends BaseModule
private function printSystemJSON(array $owner)
{
$baseURL = $this->baseUrl;
$baseURL = (string)$this->baseUrl;
$json = [
'subject' => 'acct:' . $owner['addr'],
'aliases' => [$owner['url']],
@ -151,7 +151,7 @@ class Xrd extends BaseModule
private function printJSON(string $alias, array $owner, array $avatar)
{
$baseURL = $this->baseUrl;
$baseURL = (string)$this->baseUrl;
$json = [
'subject' => 'acct:' . $owner['addr'],
@ -228,7 +228,7 @@ class Xrd extends BaseModule
private function printXML(string $alias, array $owner, array $avatar)
{
$baseURL = $this->baseUrl;
$baseURL = (string)$this->baseUrl;
$xmlString = XML::fromArray([
'XRD' => [