Merge 12468b885b into 17e9d308b8

2013-12-30 10:01:33 -08:00 · 2013-12-30 10:01:33 -08:00 · 8ec0004430
parent 17e9d308b8 12468b885b
commit 8ec0004430
1 changed files with 2 additions and 0 deletions
--- a/class.phpmailer.php
+++ b/class.phpmailer.php
@ -2720,6 +2720,8 @@ class PHPMailer
            $result = $this->Hostname;
        } elseif (isset($_SERVER['SERVER_NAME'])) {
            $result = $_SERVER['SERVER_NAME'];
+        } elseif (gethostname() != false) {
+            $result = gethostname();
        } else {
            $result = 'localhost.localdomain';
        }