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

Author: jleroux
Date: Sun Aug 26 08:44:51 2012
New Revision: 1377391

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

Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1377382,1377390

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=1377391&r1=1377390&r2=1377391&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 Aug 26 08:44:51 2012
@@ -1076,13 +1076,16 @@ public class ModelFormField {
     }
 
     public String getTooltip(Map<String, Object> context) {
-        if (tooltip != null && !tooltip.isEmpty()) {
-            return tooltip.expandString(context);
-        } else {
-            return "";
+        String tooltipString = "";
+        if (tooltip != null && !tooltip.isEmpty()) tooltipString = tooltip.expandString(context);
+        if (this.getEncodeOutput()) {
+            StringUtil.SimpleEncoder simpleEncoder = (StringUtil.SimpleEncoder) context.get("simpleEncoder");
+            if (simpleEncoder != null) tooltipString = simpleEncoder.encode(tooltipString);
         }
+        return tooltipString;
     }
 
+
     public String getUseWhen(Map<String, Object> context) {
         if (this.useWhen != null && !this.useWhen.isEmpty()) {
             return this.useWhen.expandString(context);