svn commit: r957658 - in /ofbiz/trunk/framework/widget/templates: foFormMacroLibrary.ftl foScreenMacroLibrary.ftl

[jonesde]

Author: jonesde
Date: Thu Jun 24 18:09:08 2010
New Revision: 957658

URL: http://svn.apache.org/viewvc?rev=957658&view=rev
Log:
Fixed issue with XML reserved characters in screen and form data, they will now be encoded and display properly instead of causing an error about bad formatting in an entity

Modified:
    ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
    ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl

Modified: ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl?rev=957658&r1=957657&r2=957658&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl Thu Jun 24 18:09:08 2010
@@ -36,8 +36,10 @@ under the License.
     <#assign foStyle = foStyles[style]?default("")/>
     ${foStyle?default("")}
 </#macro>
-<#macro makeBlock style text><fo:block<#if style?has_content> <@getFoStyle style/></#if>><#if text?exists>${text}</#if></fo:block></#macro>
 
+<#escape x as x?xml>
+
+<#macro makeBlock style text><fo:block<#if style?has_content> <@getFoStyle style/></#if>><#if text?exists>${text}</#if></fo:block></#macro>
 
 <#macro renderField text><#if text?exists>${text}</#if></#macro>
 
@@ -138,3 +140,4 @@ under the License.
 <#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc title alternate linkUrl targetWindow description confirmation><@makeBlock linkStyle description /></#macro>
 <#macro renderTooltip tooltip tooltipStyle></#macro>
 <#macro renderAsterisks requiredField requiredStyle></#macro>
+</#escape>

Modified: ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl?rev=957658&r1=957657&r2=957658&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl Thu Jun 24 18:09:08 2010
@@ -35,6 +35,8 @@ under the License.
     ${foStyle?default("")}
 </#macro>
 
+<#escape x as x?xml>
+
 <#macro renderScreenBegin>
 <?xml version="1.0" encoding="UTF-8"?>
 </#macro>
@@ -66,4 +68,6 @@ under the License.
 <#macro renderScreenletSubWidget></#macro>
 <#macro renderScreenletEnd></#macro>
 
-<#macro renderScreenletPaginateMenu lowIndex actualPageSize ofLabel listSize paginateLastStyle lastLinkUrl paginateLastLabel paginateNextStyle nextLinkUrl paginateNextLabel paginatePreviousStyle paginatePreviousLabel previousLinkUrl paginateFirstStyle paginateFirstLabel firstLinkUrl></#macro>
\ No newline at end of file
+<#macro renderScreenletPaginateMenu lowIndex actualPageSize ofLabel listSize paginateLastStyle lastLinkUrl paginateLastLabel paginateNextStyle nextLinkUrl paginateNextLabel paginatePreviousStyle paginatePreviousLabel previousLinkUrl paginateFirstStyle paginateFirstLabel firstLinkUrl></#macro>
+</#escape>
+