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:40:46 UTC
svn commit: r1377390 -
/ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
Author: jleroux
Date: Sun Aug 26 08:40:46 2012
New Revision: 1377390
URL: http://svn.apache.org/viewvc?rev=1377390&view=rev
Log:
Unlike descriptions and values, tooltips were not encoded, thanks to Scott for spotting it
Modified:
ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
Modified: ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1377390&r1=1377389&r2=1377390&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Sun Aug 26 08:40:46 2012
@@ -1089,11 +1089,13 @@ 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) {