From 34755d0fce9f688f4594a6d1cbf71a0fb17e74ec Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 6 May 2011 14:34:10 +0000 Subject: [PATCH] See ChangeLog. Monotone-Parent: 56f2ec58d7c4d13a4fd5d2b2ef3d23ebab1cbd4c Monotone-Revision: 33fc22b2046a2c5d54cd55b2e023acb6b89d7ef4 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-05-06T14:34:10 Monotone-Branch: ca.inverse.sogo Monotone-Tag: SOGo_v1.3.7a --- ChangeLog | 6 ++++++ UI/WebServerResources/UIxPreferences.js | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ba503a8a..ea89b892d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-05-06 Francis Lachapelle + + * UI/WebServerResources/UIxPreferences.js + (displayAccountSignature): fixed an issue with an HTML signature + that start with a paragraph tag. + 2011-05-05 Ludovic Marcotte * UI/MailerUI/UIxMailAccountActions.m - fixed an issue diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js index eb247bfc1..417a08e4c 100644 --- a/UI/WebServerResources/UIxPreferences.js +++ b/UI/WebServerResources/UIxPreferences.js @@ -670,9 +670,7 @@ function displayAccountSignature(mailAccount) { var identity = (mailAccount["identities"] ? mailAccount["identities"][0] : {} ); - var value = identity["signature"].replace(/^[ \n\r]*$/, ""); - if (CKEDITOR.instances["signature"]) - value = value.stripTags().unescapeHTML(); + var value = identity["signature"].stripTags().unescapeHTML().replace(/^[ \n\r]*/, ""); if (value && value.length > 0) { if (value.length < 30) { actSignatureValue = value;