cvs: pear /Mail_Mime mimePart.php

cipri Mon Apr 23 23:48:13 2007 UTC Modified files: /pear/Mail_Mime mimePart.php Log: Fix for Bug #10816 Unwanted linebreak at the end of output http://cvs.php.net/viewvc.cgi/pear/Mail_Mime/mimePart.php?r1=1.21&r2=1.22&diff_format=u Index: pear/Mail_Mime/mimePart.php diff -u pear/Mail_Mime/mimePart.php:1.21 pear/Mail_Mime/mimePart.php:1.22 --- pear/Mail_Mime/mimePart.php:1.21 Thu Apr 5 09:56:55 2007 +++ pear/Mail_Mime/mimePart.php Mon Apr 23 23:48:13 2007 @@ -47,7 +47,7 @@ * @author Sean Coates <sean@php.net> * @copyright 2003-2006 PEAR <pear-group@php.net> * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version CVS: $Id: mimePart.php,v 1.21 2007/04/05 09:56:55 cipri Exp $ + * @version CVS: $Id: mimePart.php,v 1.22 2007/04/23 23:48:13 cipri Exp $ * @link http://pear.php.net/package/Mail_mime */ @@ -219,15 +219,15 @@ foreach ($tmp['headers'] as $key => $value) { $headers[] = $key . ': ' . $value; } - $subparts[] = implode(MAIL_MIMEPART_CRLF, $headers) . MAIL_MIMEPART_CRLF . MAIL_MIMEPART_CRLF . $tmp['body']; + $subparts[] = implode(MAIL_MIMEPART_CRLF, $headers) . MAIL_MIMEPART_CRLF . MAIL_MIMEPART_CRLF . $tmp['body'] . MAIL_MIMEPART_CRLF; } - $encoded['body'] = '--' . $boundary . MAIL_MIMEPART_CRLF . - implode('--' . $boundary . MAIL_MIMEPART_CRLF, $subparts) . - '--' . $boundary.'--' . MAIL_MIMEPART_CRLF . MAIL_MIMEPART_CRLF; + $encoded['body'] = '--' . $boundary . MAIL_MIMEPART_CRLF . + rtrim(implode('--' . $boundary . MAIL_MIMEPART_CRLF , $subparts), MAIL_MIMEPART_CRLF) . MAIL_MIMEPART_CRLF . + '--' . $boundary.'--' . MAIL_MIMEPART_CRLF; } else { - $encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding) . MAIL_MIMEPART_CRLF; + $encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding); } // Add headers to $encoded