[jan] Don't try authentication to SMTP server if explicitly disabled …

…(Bug #12830).
horde · Nov 18, 2013 · ad9066f · ad9066f
1 parent e987319
commit ad9066f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/framework/Core/lib/Horde/Core/Factory/Mail.php b/framework/Core/lib/Horde/Core/Factory/Mail.php
@@ -49,7 +49,9 @@ public function create($config = null)
 
         if (strcasecmp($transport, 'smtp') === 0) {
             $transport = 'Smtphorde';
-        } elseif (empty($params['auth'])) {
+        }
+
+        if (empty($params['auth'])) {
             unset($params['username'], $params['password']);
         }
 

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
@@ -39,7 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [jan] Don&apos;t try authentication to SMTP server if explicitly disabled (Bug #12830).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -3240,7 +3240,7 @@
    <date>2013-11-12</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [jan] Don&apos;t try authentication to SMTP server if explicitly disabled (Bug #12830).
    </notes>
   </release>
  </changelog>