Author: jleroux
Date: Sun Aug 26 08:21:50 2012
New Revision: 1377383
URL: http://svn.apache.org/viewvc?rev=1377383&view=rev
Log:
"Applied fix from trunk for revision: 1377382 "
------------------------------------------------------------------------
r1377382 | jleroux | 2012-08-26 10:21:05 +0200 (dim., 26 août 2012) | 1 line
Unlike descriptions and values, tooltips were not encoded, thanks to Scott for
spotting it
------------------------------------------------------------------------
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1377382
Modified:
ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1377383&r1=1377382&r2=1377383&view=diff
==============================================================================
---
ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
(original)
+++
ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
Sun Aug 26 08:21:50 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) {
