Skip to content
Browse files

Merge branch 'hotfix/3208'

Close #3208
  • Loading branch information...
2 parents 3a129de + 22a09a0 commit 36a405075226395b8d4c0a17ce2de63f706b044a @weierophinney weierophinney committed
Showing with 4 additions and 4 deletions.
  1. +4 −4 library/Zend/Mime/Part.php
View
8 library/Zend/Mime/Part.php
@@ -73,7 +73,7 @@ public function isStream()
* @return stream
* @throws Exception\RuntimeException if not a stream or unable to append filter
*/
- public function getEncodedStream()
+ public function getEncodedStream($EOL = Mime::LINEEND)
{
if (!$this->isStream) {
throw new Exception\RuntimeException('Attempt to get a stream from a string part');
@@ -88,7 +88,7 @@ public function getEncodedStream()
STREAM_FILTER_READ,
array(
'line-length' => 76,
- 'line-break-chars' => Mime::LINEEND
+ 'line-break-chars' => $EOL
)
);
if (!is_resource($filter)) {
@@ -102,7 +102,7 @@ public function getEncodedStream()
STREAM_FILTER_READ,
array(
'line-length' => 76,
- 'line-break-chars' => Mime::LINEEND
+ 'line-break-chars' => $EOL
)
);
if (!is_resource($filter)) {
@@ -123,7 +123,7 @@ public function getEncodedStream()
public function getContent($EOL = Mime::LINEEND)
{
if ($this->isStream) {
- return stream_get_contents($this->getEncodedStream());
+ return stream_get_contents($this->getEncodedStream($EOL));
}
return Mime::encode($this->content, $this->encoding, $EOL);
}

0 comments on commit 36a4050

Please sign in to comment.
Something went wrong with that request. Please try again.