From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Sun, 8 Jan 2017 16:33:10 +0000 (+0100)
Subject: Improve Email::getHost()
X-Git-Tag: 3.0.0~16^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b64c893b8567d40ed2f4ce4190a628e5fc823570;p=GitHub%2FWoltLab%2FWCF.git

Improve Email::getHost()

Previously varying hostnames would be used in a multi domain setup.
Now the hostname of WoltLab Suite Core is used.
---

diff --git a/wcfsetup/install/files/lib/system/email/Email.class.php b/wcfsetup/install/files/lib/system/email/Email.class.php
index 230c7bc613..3cdda48134 100644
--- a/wcfsetup/install/files/lib/system/email/Email.class.php
+++ b/wcfsetup/install/files/lib/system/email/Email.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\email;
+use wcf\system\application\ApplicationHandler;
 use wcf\system\background\job\AbstractBackgroundJob;
 use wcf\system\background\job\EmailDeliveryBackgroundJob;
 use wcf\system\background\BackgroundQueueHandler;
@@ -92,13 +93,7 @@ class Email {
 	 */
 	public static function getHost() {
 		if (self::$host === null) {
-			self::$host = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
-			if (empty(self::$host)) {
-				self::$host = gethostname();
-				if (self::$host === false) {
-					self::$host = 'localhost';
-				}
-			}
+			self::$host = ApplicationHandler::getInstance()->getApplication('wcf')->domainName;
 		}
 		
 		return self::$host;