From e3d5cececbf8c5c04da8b7c861fc8d60978c1a59 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Mon, 12 Nov 2007 16:07:55 +0000 Subject: [PATCH] Merged V2.1 to HEAD 6933: Various fixes for cross-site javascript and associated trickery to web-client UI screens Plus fixes to several dialogs broken in use-the-link dialog conversion changes. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/templates/content/examples/doc_info.ftl | 2 +- config/alfresco/templates/content/examples/my_summary.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/alfresco/templates/content/examples/doc_info.ftl b/config/alfresco/templates/content/examples/doc_info.ftl index 72e4a2716a..8ecfeb2ca1 100644 --- a/config/alfresco/templates/content/examples/doc_info.ftl +++ b/config/alfresco/templates/content/examples/doc_info.ftl @@ -47,7 +47,7 @@ <#-- Otherwise treat it as a string --> <#else> - ${t} = ${document.properties[t]} + ${t} = ${document.properties[t]?html} diff --git a/config/alfresco/templates/content/examples/my_summary.ftl b/config/alfresco/templates/content/examples/my_summary.ftl index c2803041f9..23c6db3623 100644 --- a/config/alfresco/templates/content/examples/my_summary.ftl +++ b/config/alfresco/templates/content/examples/my_summary.ftl @@ -1,6 +1,6 @@ <#-- Table of some summary details about the current user --> - +
Name: ${person.properties.firstName} ${person.properties.lastName}
Name: ${person.properties.firstName?html} ${person.properties.lastName?html}
User: ${person.properties.userName}
Home Space location: ${userhome.displayPath}/${userhome.name}
Items in Home Space: ${userhome.children?size}