Fix encoding of new calendars + new subscriptions

pull/53/head
Francis Lachapelle 2014-08-25 10:12:09 -04:00
parent e044476772
commit 74bd96e5a6
2 changed files with 3 additions and 2 deletions

1
NEWS
View File

@ -9,6 +9,7 @@ Enchancements
Bug fixes
- fixed crasher when subscribing users to resources (#2892)
- fixed encoding of new calendars and new subscriptions (JavaScript only)
2.2.7 (2014-07-30)
------------------

View File

@ -3331,7 +3331,7 @@ function updateCalendarProperties(calendarID, calendarName, calendarColor) {
// log("nodeID: " + nodeID);
var calendarNode = $(nodeID);
var displayNameNode = calendarNode.childNodesWithTag("span")[0];
displayNameNode.innerHTML = calendarName;
displayNameNode.innerHTML = calendarName.escapeHTML();
appendStyleElement(nodeID, calendarColor);
}
@ -3515,7 +3515,7 @@ function appendCalendar(folderName, folderPath) {
li.appendChild(colorBox);
var displayName = document.createElement("span");
displayName.appendChild(document.createTextNode(folderName));
displayName.appendChild(document.createTextNode(folderName.escapeHTML()));
li.appendChild(displayName);
$(colorBox).addClassName("colorBox");