Code style, changelog

staheand · Feb 14, 2014 · f9d229a · f9d229a
1 parent 6af1362
commit f9d229a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/changelog.md b/changelog.md
@@ -19,6 +19,7 @@
 * Improve Chinese translation (Thanks to @PeterDaveHello)
 * Add Georgian translation (Thanks to @akalongman)
 * Add Greek translation (Thanks to @lenasterg)
+* Fix serverHostname on PHP < 5.3
 
 ## Version 5.2.7 (September 12th 2013)
 * Add Ukranian translation from @Krezalis

diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -2730,10 +2730,10 @@ protected function serverHostname()
             $result = $this->Hostname;
         } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
             $result = $_SERVER['SERVER_NAME'];
-        } elseif (function_exists("gethostname") && gethostname() !== false) {
+        } elseif (function_exists('gethostname') && gethostname() !== false) {
             $result = gethostname();
-        }elseif (php_uname("n") !== false){
-            $result = php_uname("n");
+        } elseif (php_uname('n') !== false) {
+            $result = php_uname('n');
         }
         return $result;
     }