From 0c6beb3fd7545332293b0b079b4a2d0f9b687fb4 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 6 Apr 2016 08:50:40 -0400
Subject: [PATCH] (fix) properly escape the user's display name (fixes #3617)

---
 NEWS                          | 1 +
 UI/Templates/UIxPageFrame.wox | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 49be92d04..9c6f71013 100644
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,7 @@ Bug fixes
  - [web] avoid marking mails as read when archiving a folder (#2792)
  - [web] fixed crash when sending a message with a special priority
  - [web] fixed saving of a custom weekly recurrence definition
+ - [web] properly escape the user's display name (#3617)
  - [dav] we now handle the default classifications for tasks (#3541)
  - [eas] properly unfold long mail headers (#3152)
  - [eas] correctly set EAS message class for S/MIME messages (#3576)
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 5f1f5870b..54cf69b9e 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -93,7 +93,7 @@
             <var:if condition="shortUserNameForDisplay" const:value="anonymous" const:negate="YES">
               var UserFolderURL = '<var:string value="userFolderPath" const:escapeHTML="NO" />';
               var UserLogin = '<var:string value="shortUserNameForDisplay" const:escapeHTML="NO" />';
-              var UserIdentification = '<var:string value="userIdentification" const:escapeHTML="NO" />';
+              var UserIdentification = <var:string value="userIdentification.doubleQuotedString" const:escapeHTML="NO" />;
               var UserEmail = '<var:string value="userEmail" const:escapeHTML="NO" />';
               var UserLanguage = '<var:string value="userLanguage" const:escapeHTML="NO" />';