From de9497cea760849a05f52848b9a670a7006b97d6 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 15 Aug 2012 09:33:46 -0400
Subject: [PATCH] Fix line separator in exported messages (#1488603)
---
program/include/rcube_imap_generic.php | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 0ae82ea..f70b91b 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -60,7 +60,7 @@
public $others = array();
public $flags = array();
- // map header to rcube_message_header object property
+ // map header to rcube_mail_header object property
private $obj_headers = array(
'date' => 'date',
'from' => 'from',
@@ -115,6 +115,11 @@
// For backward compatibility with cached messages (#1486602)
class iilBasicHeader extends rcube_mail_header
+{
+}
+
+// Support objects created in git-master (0.9)
+class rcube_message_header extends rcube_mail_header
{
}
@@ -2450,7 +2455,7 @@
return $this->handlePartBody($mailbox, $id, $is_uid, $part);
}
- function handlePartBody($mailbox, $id, $is_uid=false, $part='', $encoding=NULL, $print=NULL, $file=NULL)
+ function handlePartBody($mailbox, $id, $is_uid=false, $part='', $encoding=NULL, $print=NULL, $file=NULL, $formatted=true)
{
if (!$this->select($mailbox)) {
return false;
@@ -2567,7 +2572,7 @@
continue;
$line = convert_uudecode($line);
// default
- } else {
+ } else if ($formatted) {
$line = rtrim($line, "\t\r\n\0\x0B") . "\n";
}
--
Gitblit v1.9.1