From 9b54e0b2a52df7e993800f8c463772f291a18d55 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Thu, 20 Sep 2007 09:36:57 -0400
Subject: [PATCH] Fix order of checks.
---
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 f56246b..256a33b 100644
--- a/program/include/rcube_smtp.inc
+++ b/program/include/rcube_smtp.inc
@@ -76,7 +76,7 @@
// 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
--
Gitblit v1.9.1