diff options
| author | svncommit <devs@roundcube.net> | 2007-09-20 13:36:57 +0000 |
|---|---|---|
| committer | svncommit <devs@roundcube.net> | 2007-09-20 13:36:57 +0000 |
| commit | 9b54e0b2a52df7e993800f8c463772f291a18d55 (patch) | |
| tree | b7110263764fcc48b3f0e06a291b4824abd9d830 /program/include/rcube_smtp.inc | |
| parent | aca3d25f1b65bc601ea66b59528e39ce158f6c89 (diff) | |
Fix order of checks.
Diffstat (limited to 'program/include/rcube_smtp.inc')
| -rw-r--r-- | program/include/rcube_smtp.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/program/include/rcube_smtp.inc b/program/include/rcube_smtp.inc index f56246bbd..256a33bc0 100644 --- a/program/include/rcube_smtp.inc +++ b/program/include/rcube_smtp.inc @@ -76,7 +76,7 @@ function smtp_mail($from, $recipients, &$headers, &$body, &$response) // create Net_SMTP object and connect to server if (!is_object($smtp_conn)) { - $helo_host = !empty($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : (!empty($CONFIG['smtp_helo_host']) ? $CONFIG['smtp_helo_host'] : 'localhost'); + $helo_host = empty($CONFIG['smtp_helo_host']) ? (empty($_SERVER['SERVER_NAME']) ? 'localhost' : $_SERVER['SERVER_NAME']) : $CONFIG['smtp_helo_host']; $SMTP_CONN = new Net_SMTP($smtp_host, $smtp_port, $helo_host); // set debugging |