friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' into fix-phpstan-error-level-2

pull/1581/head
Artur Weigandt 2024-12-13 10:28:15 +01:00 committed by GitHub
parent fff140ad43 81a84fb895
commit 68ee5260b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mailstream/phpmailer/class.phpmailer.php
View File

@ -3286,7 +3286,7 @@ class PHPMailer
$result = 'localhost.localdomain'; $result = 'localhost.localdomain';
if (!empty($this->Hostname)) { if (!empty($this->Hostname)) {
$result = $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']; $result = $_SERVER['SERVER_NAME'];
} elseif (function_exists('gethostname') && gethostname() !== false) { } elseif (function_exists('gethostname') && gethostname() !== false) {
$result = gethostname(); $result = gethostname();