bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #13003 from annando/baseurl-string

Browse source 
Fix: Force baseUrl being a string
This commit is contained in:
Hypolite Petovan 2023-04-15 10:25:21 -04:00 committed by GitHub
parent 68d9e1f33c b0f880d0eb
commit 67792bbc0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Console/Relocate.php
View file

@ -94,7 +94,7 @@ HELP;
$this->out(sprintf('Relocation started from %s to %s. Could take a while to complete.', $this->baseUrl, $this->getArgument(0))); $this->out(sprintf('Relocation started from %s to %s. Could take a while to complete.', $this->baseUrl, $this->getArgument(0)));
$old_url = $this->baseUrl; $old_url = (string)$this->baseUrl;
// Generate host names for relocation the addresses in the format user@address.tld // Generate host names for relocation the addresses in the format user@address.tld
$new_host = str_replace('http://', '@', Strings::normaliseLink($new_url)); $new_host = str_replace('http://', '@', Strings::normaliseLink($new_url));

2
src/Module/Install.php
View file

@ -343,7 +343,7 @@ class Install extends BaseModule
*/ */
private function whatNext(): string private function whatNext(): string
{ {
$baseurl = $this->baseUrl; $baseurl = (string)$this->baseUrl;
return return
$this->t('<h1>What next</h1>') $this->t('<h1>What next</h1>')
. "<p>" . $this->t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.') . "<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']; $oldBaseUrl = $account['baseurl'];
$newBaseUrl = $this->baseUrl; $newBaseUrl = (string)$this->baseUrl;
$oldAddr = str_replace('http://', '@', Strings::normaliseLink($oldBaseUrl)); $oldAddr = str_replace('http://', '@', Strings::normaliseLink($oldBaseUrl));
$newAddr = str_replace('http://', '@', Strings::normaliseLink($newBaseUrl)); $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) private function printSystemJSON(array $owner)
{ {
$baseURL = $this->baseUrl; $baseURL = (string)$this->baseUrl;
$json = [ $json = [
'subject' => 'acct:' . $owner['addr'], 'subject' => 'acct:' . $owner['addr'],
'aliases' => [$owner['url']], 'aliases' => [$owner['url']],
@ -151,7 +151,7 @@ class Xrd extends BaseModule
private function printJSON(string $alias, array $owner, array $avatar) private function printJSON(string $alias, array $owner, array $avatar)
{ {
$baseURL = $this->baseUrl; $baseURL = (string)$this->baseUrl;
$json = [ $json = [
'subject' => 'acct:' . $owner['addr'], 'subject' => 'acct:' . $owner['addr'],
@ -228,7 +228,7 @@ class Xrd extends BaseModule
private function printXML(string $alias, array $owner, array $avatar) private function printXML(string $alias, array $owner, array $avatar)
{ {
$baseURL = $this->baseUrl; $baseURL = (string)$this->baseUrl;
$xmlString = XML::fromArray([ $xmlString = XML::fromArray([
'XRD' => [ 'XRD' => [

4
src/Navigation/Notifications/Repository/Notify.php
View file

@ -264,7 +264,7 @@ class Notify extends BaseRepository
} }
} }
$siteurl = $this->baseUrl; $siteurl = (string)$this->baseUrl;
$sitename = $this->config->get('config', 'sitename'); $sitename = $this->config->get('config', 'sitename');
// with $params['show_in_notification_page'] == false, the notification isn't inserted into // with $params['show_in_notification_page'] == false, the notification isn't inserted into
@ -807,7 +807,7 @@ class Notify extends BaseRepository
$epreamble = $msg['rich']; $epreamble = $msg['rich'];
$sitename = $this->config->get('config', 'sitename'); $sitename = $this->config->get('config', 'sitename');
$siteurl = $this->baseUrl; $siteurl = (string)$this->baseUrl;
$sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.'); $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
$tsitelink = sprintf($sitelink, $siteurl); $tsitelink = sprintf($sitelink, $siteurl);