[mms] Fix sending BODY keyword when debugging and SMTP server does no…

…t support 8BITMIME extension.
horde · Mar 9, 2015 · cc32c1c · cc32c1c
1 parent 70eec46
commit cc32c1c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/framework/Smtp/lib/Horde/Smtp.php b/framework/Smtp/lib/Horde/Smtp.php
@@ -600,7 +600,7 @@ public function send($from, $to, $data, array $opts = array())
             }
         }
 
-        if (is_null($body) && $this->_debug->active) {
+        if (is_null($body) && $this->_debug->active && $this->data_8bit) {
             /* Only output extended 7bit command if debug is active (it is
              * default and does not need to be explicitly declared). */
             $body = ' BODY=7BIT';

diff --git a/framework/Smtp/package.xml b/framework/Smtp/package.xml
@@ -21,6 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [mms] Fix sending BODY keyword when debugging and SMTP server does not support 8BITMIME extension.
 * [jan] Add parameter for stream context settings (Request #13730).
 * [jan] Fix notice if server doesn&apos;t support ENHANCEDSTATUSCODES.
 * [mms] Add &apos;localhost&apos; parameter to Horde_Smtp (Request #13832).
@@ -484,6 +485,7 @@
    <date>2015-01-07</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [mms] Fix sending BODY keyword when debugging and SMTP server does not support 8BITMIME extension.
 * [jan] Add parameter for stream context settings (Request #13730).
 * [jan] Fix notice if server doesn&apos;t support ENHANCEDSTATUSCODES.
 * [mms] Add &apos;localhost&apos; parameter to Horde_Smtp (Request #13832).