From f8a371e351ce161037017ba79c367c494b6d56f1 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 9 Oct 2014 15:12:24 -0400
Subject: [PATCH] Fix folder's name when subscribing to a folder

---
 NEWS                                            | 1 +
 UI/WebServerResources/UIxContactsUserFolders.js | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index b5a36c7f3..ad28b7a62 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
 Bug fixes
  - fixed freebusy lookup with "Show time as busy" (#2930)
  - don't escape <br>'s in a card's note field
+ - fixed folder's display name when subscribing to a folder
  - fixed folder's display name when the active user subscribes another user to one of her/his folders
 
 2.2.9a (2014-09-29)
diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js
index c473906b9..37433ccaf 100644
--- a/UI/WebServerResources/UIxContactsUserFolders.js
+++ b/UI/WebServerResources/UIxContactsUserFolders.js
@@ -199,7 +199,7 @@ function addFolderBranchToTree(tree, user, folder, nodeId, subId, isLast) {
     node._ls = isLast;
 
     var content = tree.node(node, (nodeId + subId), null);
-    content._formattedName = folder.formattedName;
+    content.displayName = folder.displayName;
 
     return content;
 }
@@ -228,7 +228,7 @@ function onConfirmFolderSelection(event) {
                 folderName = description.replace(/>,.*$/, ">", "g");
             }
             else {
-                folderName = node._formattedName;
+                folderName = node.displayName;
             }
             var data = { folderName: folderName, folder: folder, type: type, window: window };
             if (parent$(accessToSubscribedFolder(folder)))