mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code style, changelog

This commit is contained in:
Synchro 2014-02-14 12:12:34 +01:00
parent 6af1362c0d
commit f9d229af54
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@ -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

6
class.phpmailer.php
View File

@ -2730,10 +2730,10 @@ class PHPMailer
$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;
}