diff options
| author | robin <robin@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-09-20 13:36:57 +0000 |
|---|---|---|
| committer | robin <robin@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-09-20 13:36:57 +0000 |
| commit | bc0288885d8c546ca2994dde06d7f98fee5935d0 (patch) | |
| tree | 989d31f75eacaef65531ff2654dab08920d5c8f0 /roundcubemail/program | |
| parent | 389e3714a18e7a14d391d6a54bd076094b19c539 (diff) | |
Fix order of checks.
git-svn-id: https://svn.roundcube.net/trunk@805 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/include/rcube_smtp.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roundcubemail/program/include/rcube_smtp.inc b/roundcubemail/program/include/rcube_smtp.inc index f56246bbd..256a33bc0 100644 --- a/roundcubemail/program/include/rcube_smtp.inc +++ b/roundcubemail/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 |