Changeset 9b54e0b in github

Timestamp:

Sep 20, 2007 9:36:57 AM (6 years ago)

Author:

svncommit <devs@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

c454710

Parents:

aca3d25

Message:

Fix order of checks.

File:

• program/include/rcube_smtp.inc (modified) (1 diff)

program/include/rcube_smtp.inc

@@ -77 +77 @@
   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);