From: Edward <edward@roojs.com>
Date: Fri, 18 Jan 2019 07:12:32 +0000 (+0800)
Subject: Merge branch 'master' of http://git.roojs.com/Pman.Core
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=72af2a6f439ba201fc187cedc3cb786f2a8ea3f1;hp=4d91a1a635365c6995c33a441d547918e21dd70a

Merge branch 'master' of git.roojs.com/Pman.Core
---

diff --git a/Mailer.php b/Mailer.php
index 23fb8758..af621736 100644
--- a/Mailer.php
+++ b/Mailer.php
@@ -122,7 +122,7 @@ class Pman_Core_Mailer {
         
         $ff = HTML_FlexyFramework::get();
         $http_host = isset($_SERVER["HTTP_HOST"]) ? $_SERVER["HTTP_HOST"] : 'pman.HTTP_HOST.not.set';
-        if (isset($ff->Pman['HTTP_HOST'])) {
+        if (isset($ff->Pman['HTTP_HOST']) && $http_host != 'localhost') {
             $http_host  = $ff->Pman['HTTP_HOST'];
         }