From 8742f28c29dd524973ca80bb3a5cee095e879a69 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 13 Mar 2014 08:44:47 -0400 Subject: [PATCH] Fix decoding of HTML entitities in reminder alert Fixes #2659 --- NEWS | 1 + UI/WebServerResources/generic.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 546570c21..fa353b2bb 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ Bug fixes - disable file paste support in mail editor (#2641) - fixed copying/moving messages to a mail folder begining with a digit (#2658) - fixed unseen count for folders beginning with a digit and used in Sieve filters (#2652) + - fixed decoding of HTML entities in reminder alerts (#2659) 2.2.1 (2014-03-07) ------------------ diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index f6a9e4888..5a9b2054a 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -1477,7 +1477,7 @@ function showAlarmCallback(http) { if (data["description"].length) msg += "\n\n" + data["description"]; - window.alert(msg.unescapeHTML()); + window.alert(msg.decodeEntities()); showSelectDialog(data["summary"], _('Snooze for '), { '5': _('5 minutes'), '10': _('10 minutes'),