You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/02/13 11:58:24 UTC
svn commit: r744061 -
/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
Author: jleroux
Date: Fri Feb 13 10:58:24 2009
New Revision: 744061
URL: http://svn.apache.org/viewvc?rev=744061&view=rev
Log:
This fix "Encoding issue in screenFop" https://issues.apache.org/jira/browse/OFBIZ-2183 - OFBIZ-2183
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java?rev=744061&r1=744060&r2=744061&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java Fri Feb 13 10:58:24 2009
@@ -192,7 +192,12 @@
}
//FreeMarkerWorker.renderTemplateAtLocation(location, context, writer);
- Template template = FreeMarkerWorker.getTemplate(location, specialTemplateCache, specialConfig);
+ Template template = null;
+ if (location.endsWith(".fo.ftl")) { // FOP can't render correctly escaped characters
+ template = FreeMarkerWorker.getTemplate(location);
+ } else {
+ template = FreeMarkerWorker.getTemplate(location, specialTemplateCache, specialConfig);
+ }
FreeMarkerWorker.renderTemplate(template, context, writer);
if (insertWidgetBoundaryComments) {