From 2ff0d3baded1ca4e722c8df6adc791f94d27b5fc Mon Sep 17 00:00:00 2001
From: David Caruana <david.caruana@alfresco.com>
Date: Fri, 18 Jun 2010 12:08:05 +0000
Subject: [PATCH] Fix ALF-3585: AtomPub summary can render first part of binary
 content resulting in invalid XML

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20705 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../webscripts/org/alfresco/cmis/lib/atomentry.lib.atom.ftl   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/cmis/lib/atomentry.lib.atom.ftl b/config/alfresco/templates/webscripts/org/alfresco/cmis/lib/atomentry.lib.atom.ftl
index c694f32767..e89adf226c 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/cmis/lib/atomentry.lib.atom.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/cmis/lib/atomentry.lib.atom.ftl
@@ -787,8 +787,8 @@
 [#--                                --]
 
 [#-- Helper to render Atom Summary --]
-[#macro contentsummary node][#if node.properties.description??]${node.properties.description?xml}[#elseif node.properties.title??]${node.properties.title?xml}[#elseif node.mimetype?? && node.mimetype == "text/plain"]${cropContent(node.properties.content, 50)?xml}[#else]${node.properties.name?xml}[/#if][/#macro]
-[#macro foldersummary node][#if node.properties.description??]${node.properties.description?xml}[#elseif node.properties.title??]${node.properties.title?xml}[#else][/#if][/#macro]
+[#macro contentsummary node][#if node.properties.description??]${node.properties.description?xml}[#elseif node.properties.title??]${node.properties.title?xml}[#elseif node.properties.name??]${node.properties.name?xml}[#else][/#if][/#macro]
+[#macro foldersummary node][#if node.properties.description??]${node.properties.description?xml}[#elseif node.properties.title??]${node.properties.title?xml}[#elseif node.properties.name??]${node.properties.name?xml}[#else][/#if][/#macro]
 
 [#-- Helper to render Alfresco content type to Atom content type --]
 [#macro contenttype type][#if type == "text/html"]text[#elseif type == "text/xhtml"]xhtml[#elseif type == "text/plain"]text[#else]${type}[/#if][/#macro]