From b0c902622352713a481088104ad9adfe4a06b18e Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sun, 25 Jan 2015 18:01:04 +0100 Subject: Fix bug where signature could have been inserted twice after plain-to-html switch (#1490239) --- program/js/editor.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'program/js/editor.js') diff --git a/program/js/editor.js b/program/js/editor.js index 2fc3429ab..92165348a 100644 --- a/program/js/editor.js +++ b/program/js/editor.js @@ -213,8 +213,10 @@ function rcube_text_editor(config, id) content = input.val(); // replace current text signature with temp mark - if (is_sig) - content = content.replace(signature.text, sig_mark); + if (is_sig) { + content = content.replace(/\r\n/, "\n"); + content = content.replace(signature.text.replace(/\r\n/, "\n"), sig_mark); + } var init_editor = function(data) { // replace signature mark with html version of the signature -- cgit v1.2.3