Author: jacopoc Date: Wed Oct 4 02:03:58 2006 New Revision: 452803 URL: http://svn.apache.org/viewvc?view=rev&rev=452803 Log: The <#escape x as x?xml> directive will escape all the ${} interpolations with the ?xml directive to avoid problem with special characters such as the one reported by Eriks Dobelis in OFBIZ-357.
Modified: incubator/ofbiz/trunk/framework/common/webcommon/includes/reportTemplate.fo.ftl incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl Modified: incubator/ofbiz/trunk/framework/common/webcommon/includes/reportTemplate.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/webcommon/includes/reportTemplate.fo.ftl?view=diff&rev=452803&r1=452802&r2=452803 ============================================================================== --- incubator/ofbiz/trunk/framework/common/webcommon/includes/reportTemplate.fo.ftl (original) +++ incubator/ofbiz/trunk/framework/common/webcommon/includes/reportTemplate.fo.ftl Wed Oct 4 02:03:58 2006 @@ -15,7 +15,7 @@ License for the specific language governing permissions and limitations under the License. --> - +<#escape x as x?xml> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> <fo:layout-master-set> <fo:simple-page-master master-name="main-page" @@ -65,3 +65,4 @@ </fo:flow> </fo:page-sequence> </fo:root> +</#escape> Modified: incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl?view=diff&rev=452803&r1=452802&r2=452803 ============================================================================== --- incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl (original) +++ incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl Wed Oct 4 02:03:58 2006 @@ -15,7 +15,7 @@ License for the specific language governing permissions and limitations under the License. --> - +<#escape x as x?xml> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> <fo:layout-master-set> @@ -73,3 +73,4 @@ </fo:flow> </fo:page-sequence> </fo:root> +</#escape>