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 2012/08/26 10:21:06 UTC

svn commit: r1377382 - /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java

Author: jleroux
Date: Sun Aug 26 08:21:05 2012
New Revision: 1377382

URL: http://svn.apache.org/viewvc?rev=1377382&view=rev
Log:
Unlike descriptions and values, tooltips were not encoded, thanks to Scott for spotting it

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1377382&r1=1377381&r2=1377382&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Sun Aug 26 08:21:05 2012
@@ -953,9 +953,17 @@ public class ModelFormField {
     }
 
     public String getTooltip(Map<String, Object> context) {
-        if (UtilValidate.isNotEmpty(tooltip)) return tooltip.expandString(context);
+        if (UtilValidate.isNotEmpty(tooltip) && this.getEncodeOutput()) {
+            String tooltipString = tooltip.expandString(context);
+            StringUtil.SimpleEncoder simpleEncoder = (StringUtil.SimpleEncoder) context.get("simpleEncoder");
+            if (simpleEncoder != null) {
+                tooltipString = simpleEncoder.encode(tooltipString);
+            }
+            return tooltipString;
+        } else {
             return "";
         }
+    }
 
     
     public String getUseWhen(Map<String, Object> context) {