diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2019-10-28 18:16:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-28 18:16:36 +0300 |
| commit | cd158143331f7332d25442005306e7bc6edb3248 (patch) | |
| tree | 236b1ea30b5d53f911be05342804353a8b011bd0 | |
| parent | 8798a2d93b0d85867299c4dc0565adfab2ce725c (diff) | |
| parent | 7e6fe7e250a2544f19c9f5e0e30a7038552305e2 (diff) | |
Merge pull request #2192 from nextcloud/fix/reply-email-removed
Fix removed reply to email
| -rw-r--r-- | src/ReplyBuilder.js | 6 | ||||
| -rw-r--r-- | src/tests/unit/ReplyBuilder.spec.js | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ReplyBuilder.js b/src/ReplyBuilder.js index a8f951257..9f86c3709 100644 --- a/src/ReplyBuilder.js +++ b/src/ReplyBuilder.js @@ -29,9 +29,9 @@ export const buildReplyBody = (original, from, date) => { if (from) { const dateString = moment.unix(date).format('LLL') - return start + `"${from.label}" <${from.email}> – ${dateString}` + body + return `${start}"${from.label}" ${from.email} – ${dateString}` + body } else { - return start + body + return `${start}${body}` } } @@ -41,7 +41,7 @@ export const buildHtmlReplyBody = (original, from, date) => { if (from) { const dateString = moment.unix(date).format('LLL') - return `${start}"${from.label}" <${from.email}> – ${dateString}<br>${body}` + return `${start}"${from.label}" ${from.email} – ${dateString}<br>${body}` } else { return `${start}${body}` } diff --git a/src/tests/unit/ReplyBuilder.spec.js b/src/tests/unit/ReplyBuilder.spec.js index 961c8e099..240be88f5 100644 --- a/src/tests/unit/ReplyBuilder.spec.js +++ b/src/tests/unit/ReplyBuilder.spec.js @@ -57,7 +57,7 @@ describe('ReplyBuilder', () => { it('creates a reply body', () => { const body = 'Newsletter\nhello' - const expectedReply = '\n\n"Test User" <test@user.ru> – November 5, 2018 ' + const expectedReply = '\n\n"Test User" test@user.ru – November 5, 2018 ' const replyBody = buildReplyBody( body, |