From 9b54e0b2a52df7e993800f8c463772f291a18d55 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Thu, 20 Sep 2007 13:36:57 +0000
Subject: Fix order of checks.

---
 program/include/rcube_smtp.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program/include')

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
-- 
cgit v1.2.3