svn commit: r1039878 - /ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java

[buscob]

Author: buscob
Date: Sun Nov 28 13:10:56 2010
New Revision: 1039878

URL: http://svn.apache.org/viewvc?rev=1039878&view=rev
Log:
Applied fix from trunk for revision: 1039767
 [OFBIZ-4036] Form widget display field descriptions were still being encoded when encode-output was set to false.  Bug reported by Bruno Busco.

Modified:
    ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java

Modified: ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1039878&r1=1039877&r2=1039878&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Sun Nov 28 13:10:56 2010
@@ -2099,7 +2099,7 @@ public class ModelFormField {
             String retVal = null;
             if (this.description != null && !this.description.isEmpty()) {
                 retVal = this.description.expandString(context);
-                if (retVal != null) {
+                if (retVal != null && this.getModelFormField().getEncodeOutput()) {
                     StringUtil.SimpleEncoder simpleEncoder = (StringUtil.SimpleEncoder) context.get("simpleEncoder");
                     if (simpleEncoder != null) {
                         retVal = simpleEncoder.encode(retVal);