From d26b76b305b146c0d98f24cd7ef25ba062f638fd Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Fri, 16 Jan 2009 11:05:20 +0000 Subject: [PATCH] Merged V3.0 to HEAD (Another fix for ALFCOM-2332) 12814: Merged V2.2 to V3.0 12811: Yet another fix for ETWOTWO-987: summary pages of WCM wizards show HTML code git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12815 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java index 1a2cd97df2..ced52d5d46 100644 --- a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java +++ b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java @@ -1566,13 +1566,13 @@ public class CreateWebsiteWizard extends BaseWizardBean String formDescription = DescriptionAttributeHelper.getDescriptionNotEmpty(fc, this.getDescription()); String workflowTitle = getWorkflow() == null ? DescriptionAttributeHelper.SPAN_ITALIC_BEGIN + Application.getMessage(fc, "none") + - DescriptionAttributeHelper.SPAN_END : getWorkflow().getTitle(); + DescriptionAttributeHelper.SPAN_END : Utils.encode(getWorkflow().getTitle()); attribute.append(DescriptionAttributeHelper.getTableBegin()); attribute.append(DescriptionAttributeHelper.getTableLine(fc, "name", this.getName())); attribute.append(DescriptionAttributeHelper.getTableLine(fc, "title", this.getTitle())); attribute.append(DescriptionAttributeHelper.getTableLine(fc, "output_path_pattern", this.getOutputPathPattern())); attribute.append(DescriptionAttributeHelper.getTableLine(fc, "description", formDescription, false)); - attribute.append(DescriptionAttributeHelper.getTableLine(fc, "workflow", workflowTitle)); + attribute.append(DescriptionAttributeHelper.getTableLine(fc, "workflow", workflowTitle, false)); attribute.append(DescriptionAttributeHelper.getTableEnd()); return attribute.toString(); }