diff options
| -rw-r--r-- | program/lib/Roundcube/rcube_text2html.php | 2 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 3 | ||||
| -rw-r--r-- | tests/Framework/Text2Html.php | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_text2html.php b/program/lib/Roundcube/rcube_text2html.php index 60016fffd..8bcda301c 100644 --- a/program/lib/Roundcube/rcube_text2html.php +++ b/program/lib/Roundcube/rcube_text2html.php @@ -49,7 +49,7 @@ class rcube_text2html // enables format=flowed parser 'flowed' => false, // enables wrapping for non-flowed text - 'wrap' => false, + 'wrap' => true, // line-break tag 'break' => "<br>\n", // prefix and suffix (wrapper element) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index ac0d7fc5f..a1d1a4163 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -874,7 +874,8 @@ function rcmail_print_body($part, $p = array()) */ function rcmail_plain_body($body, $flowed = false) { - $text2html = new rcube_text2html($body, false, array('flowed' => $flowed)); + $options = array('flowed' => $flowed, 'wrap' => !$flowed); + $text2html = new rcube_text2html($body, false, $options); $body = $text2html->get_html(); return $body; diff --git a/tests/Framework/Text2Html.php b/tests/Framework/Text2Html.php index 91dabf2b7..af2604d8e 100644 --- a/tests/Framework/Text2Html.php +++ b/tests/Framework/Text2Html.php @@ -19,6 +19,7 @@ class Framework_Text2Html extends PHPUnit_Framework_TestCase 'break' => '<br>', 'links' => false, 'flowed' => false, + 'wrap' => false, 'space' => '_', // replace UTF-8 non-breaking space for simpler testing ); |