Fix bad merge again.

horde · Sep 28, 2013 · f460fc3 · f460fc3
1 parent cf3fce9
commit f460fc3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/framework/Mime/lib/Horde/Mime/Part.php b/framework/Mime/lib/Horde/Mime/Part.php
@@ -548,7 +548,8 @@ protected function _transferEncode($fp, $encoding)
             return $this->_writeStream($fp, array(
                 'filter' => array(
                     'convert.base64-encode' => array(
-                        'line-break-chars' => $this->getEOL()
+                        'line-break-chars' => $this->getEOL(),
+                        'line-length' => 76
                     )
                 )
             ));
@@ -563,8 +564,7 @@ protected function _transferEncode($fp, $encoding)
                 'filter' => array(
                     'convert.quoted-printable-encode' => array_filter(array(
                         'line-break-chars' => $stream->getEOL(),
-                        'line-length' => 76,
-                        'binary' => true
+                        'line-length' => 76
                     ))
                 )
             ));