mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2024-12-22 20:50:16 +00:00
Merge branch 'develop' into remove-app-usage
This commit is contained in:
commit
c4bea164c7
1 changed files with 1 additions and 1 deletions
|
@ -3286,7 +3286,7 @@ class PHPMailer
|
|||
$result = 'localhost.localdomain';
|
||||
if (!empty($this->Hostname)) {
|
||||
$result = $this->Hostname;
|
||||
} elseif (array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
|
||||
} elseif (!empty($_SERVER['SERVER_NAME'])) {
|
||||
$result = $_SERVER['SERVER_NAME'];
|
||||
} elseif (function_exists('gethostname') && gethostname() !== false) {
|
||||
$result = gethostname();
|
||||
|
|
Loading…
Reference in a new issue