clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adapt BaseURL calls to new UriInterface

Browse Source
This commit is contained in:
Philipp
2023-02-18 20:57:30 +01:00
parent 9e6d95284b
commit f0c29edcde
101 changed files with 218 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Protocol/Delivery.php
View File

@@ -161,7 +161,7 @@ class Delivery
// if $parent['wall'] == 1 we will already have the parent message in our array
// and we will relay the whole lot.
$localhost = DI::baseUrl()->getHostname();
$localhost = DI::baseUrl()->getHost();
if (strpos($localhost, ':')) {
$localhost = substr($localhost, 0, strpos($localhost, ':'));
}
@@ -556,7 +556,7 @@ class Delivery
$headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $local_user['email'] . '>' . "\n";
}
} else {
$sender = DI::config()->get('config', 'sender_email', 'noreply@' . DI::baseUrl()->getHostname());
$sender = DI::config()->get('config', 'sender_email', 'noreply@' . DI::baseUrl()->getHost());
$headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <' . $sender . '>' . "\n";
}