diff options
author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2019-10-25 15:24:34 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-25 15:24:34 +0300 |
commit | f9abc8bd1012db50813f5d17e98b883d5272a514 (patch) | |
tree | de309fddd7745f0535fc18e19a03ab1b2b11a067 | |
parent | 4aa9c49ef7316ab2691f90d209ccdbd55f8f1907 (diff) | |
parent | 2c8869d286a945c67ea3601f6b8017daa8671285 (diff) |
Merge pull request #2167 from nextcloud/fix/plain-text-message-line-breaks
Fix line breaks in plain text message
-rwxr-xr-x | lib/Service/Html.php | 2 | ||||
-rw-r--r-- | tests/Service/HtmlTest.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Service/Html.php b/lib/Service/Html.php index e71160b95..8c805abc4 100755 --- a/lib/Service/Html.php +++ b/lib/Service/Html.php @@ -103,7 +103,7 @@ class Html { } return [ - $body, + nl2br($body), $signature ]; } diff --git a/tests/Service/HtmlTest.php b/tests/Service/HtmlTest.php index 8f5d9cff0..8e4272c9f 100644 --- a/tests/Service/HtmlTest.php +++ b/tests/Service/HtmlTest.php @@ -82,7 +82,7 @@ class HtmlTest extends TestCase { return [ ['abc', null, 'abc'], ['abc', 'def', "abc-- \r\ndef"], - ["abc-- \r\ndef", 'ghi', "abc-- \r\ndef-- \r\nghi"], + ["abc-- <br />\r\ndef", 'ghi', "abc-- \r\ndef-- \r\nghi"], ]; } |